diff options
Diffstat (limited to 'chromium/chrome/browser/resources/chromeos')
17 files changed, 157 insertions, 59 deletions
diff --git a/chromium/chrome/browser/resources/chromeos/BUILD.gn b/chromium/chrome/browser/resources/chromeos/BUILD.gn index 72b6c86c832..6d5a60739fa 100644 --- a/chromium/chrome/browser/resources/chromeos/BUILD.gn +++ b/chromium/chrome/browser/resources/chromeos/BUILD.gn @@ -47,7 +47,7 @@ grit("camera_resources") { output_dir = "$root_gen_dir/chrome" deps = [ - "//media/capture/video/chromeos/mojo:cros_camera_js", + "//media/capture/video/chromeos/mojom:cros_camera_js", ] # The .grd contains references to generated files. diff --git a/chromium/chrome/browser/resources/chromeos/camera/BUILD.gn b/chromium/chrome/browser/resources/chromeos/camera/BUILD.gn index 813d058f946..d41c627794d 100644 --- a/chromium/chrome/browser/resources/chromeos/camera/BUILD.gn +++ b/chromium/chrome/browser/resources/chromeos/camera/BUILD.gn @@ -158,6 +158,8 @@ copy("chrome_camera_app_js_models") { "src/js/models/filenamer.js", "src/js/models/filesystem.js", "src/js/models/gallery.js", + "src/js/models/result_saver.js", + "src/js/models/video_saver.js", ] outputs = [ @@ -167,7 +169,8 @@ copy("chrome_camera_app_js_models") { copy("chrome_camera_app_js_mojo") { sources = [ - "src/js/mojo/imagecapture.js", + "src/js/mojo/device_operator.js", + "src/js/mojo/image_capture.js", ] outputs = [ @@ -232,17 +235,21 @@ copy("chrome_camera_app_views") { copy("chrome_camera_app_mojo_generated") { sources = [ "$root_gen_dir/media/capture/mojom/image_capture.mojom-lite.js", - "$root_gen_dir/media/capture/video/chromeos/mojo/camera_common.mojom-lite.js", - "$root_gen_dir/media/capture/video/chromeos/mojo/camera_metadata.mojom-lite.js", - "$root_gen_dir/media/capture/video/chromeos/mojo/camera_metadata_tags.mojom-lite.js", - "$root_gen_dir/media/capture/video/chromeos/mojo/cros_image_capture.mojom-lite.js", + "$root_gen_dir/media/capture/video/chromeos/mojom/camera_app.mojom-lite.js", + "$root_gen_dir/media/capture/video/chromeos/mojom/camera_common.mojom-lite.js", + "$root_gen_dir/media/capture/video/chromeos/mojom/camera_metadata.mojom-lite.js", + "$root_gen_dir/media/capture/video/chromeos/mojom/camera_metadata_tags.mojom-lite.js", "$root_gen_dir/mojo/public/js/mojo_bindings_lite.js", + "$root_gen_dir/ui/gfx/geometry/mojom/geometry.mojom-lite.js", + "$root_gen_dir/ui/gfx/range/mojom/range.mojom-lite.js", ] deps = [ "//media/capture/mojom:image_capture_js", - "//media/capture/video/chromeos/mojo:cros_camera_js", + "//media/capture/video/chromeos/mojom:cros_camera_js", "//mojo/public/js:bindings_lite", + "//ui/gfx/geometry/mojom:mojom_js", + "//ui/gfx/range/mojom:mojom_js", ] outputs = [ diff --git a/chromium/chrome/browser/resources/chromeos/camera/camera_resources.grd b/chromium/chrome/browser/resources/chromeos/camera/camera_resources.grd index 0f24c24ff64..0a9ac124ab1 100644 --- a/chromium/chrome/browser/resources/chromeos/camera/camera_resources.grd +++ b/chromium/chrome/browser/resources/chromeos/camera/camera_resources.grd @@ -18,6 +18,7 @@ <structure name="IDR_CAMERA_CAMERA3_DEVICE_INFO_JS" file="src/js/device/camera3_device_info.js" type="chrome_html" /> <structure name="IDR_CAMERA_CAMERA_JS" file="src/js/views/camera.js" type="chrome_html" /> <structure name="IDR_CAMERA_CONSTRAINTS_PREFERRER_JS" file="src/js/device/constraints_preferrer.js" type="chrome_html" /> + <structure name="IDR_CAMERA_DEVICE_OPERATOR_JS" file="src/js/mojo/device_operator.js" type="chrome_html" /> <structure name="IDR_CAMERA_DEVICE_INFO_UPDATER_JS" file="src/js/device/device_info_updater.js" type="chrome_html" /> <structure name="IDR_CAMERA_DIALOG_JS" file="src/js/views/dialog.js" type="chrome_html" /> <structure name="IDR_CAMERA_FILENAMER_JS" file="src/js/models/filenamer.js" type="chrome_html" /> @@ -25,7 +26,7 @@ <structure name="IDR_CAMERA_GALLERY_BASE_JS" file="src/js/views/gallery_base.js" type="chrome_html" /> <structure name="IDR_CAMERA_GALLERY_JS" file="src/js/models/gallery.js" type="chrome_html" /> <structure name="IDR_CAMERA_GALLERYBUTTON_JS" file="src/js/gallerybutton.js" type="chrome_html" /> - <structure name="IDR_CAMERA_IMAGECAPTURE_JS" file="src/js/mojo/imagecapture.js" type="chrome_html" /> + <structure name="IDR_CAMERA_IMAGECAPTURE_JS" file="src/js/mojo/image_capture.js" type="chrome_html" /> <structure name="IDR_CAMERA_LAYOUT_JS" file="src/js/views/camera/layout.js" type="chrome_html" /> <structure name="IDR_CAMERA_MAIN_CSS" file="src/css/main.css" type="chrome_html" /> <structure name="IDR_CAMERA_MAIN_HTML" file="src/views/main.html" type="chrome_html" /> @@ -38,6 +39,7 @@ <structure name="IDR_CAMERA_PREVIEW_JS" file="src/js/views/camera/preview.js" type="chrome_html" /> <structure name="IDR_CAMERA_RECORDTIME_JS" file="src/js/views/camera/recordtime.js" type="chrome_html" /> <structure name="IDR_CAMERA_RESOLUTION_EVENT_BROKER_JS" file="src/js/resolution_event_broker.js" type="chrome_html" /> + <structure name="IDR_CAMERA_RESULT_SAVER_JS" file="src/js/models/result_saver.js" type="chrome_html" /> <structure name="IDR_CAMERA_SCROLLBAR_JS" file="src/js/scrollbar.js" type="chrome_html" /> <structure name="IDR_CAMERA_SETTINGS_JS" file="src/js/views/settings.js" type="chrome_html" /> <structure name="IDR_CAMERA_SOUND_JS" file="src/js/sound.js" type="chrome_html" /> @@ -46,6 +48,7 @@ <structure name="IDR_CAMERA_TOAST_JS" file="src/js/toast.js" type="chrome_html" /> <structure name="IDR_CAMERA_TOOLTIP_JS" file="src/js/tooltip.js" type="chrome_html" /> <structure name="IDR_CAMERA_UTIL_JS" file="src/js/util.js" type="chrome_html" /> + <structure name="IDR_CAMERA_VIDEO_SAVER_JS" file="src/js/models/video_saver.js" type="chrome_html" /> <structure name="IDR_CAMERA_VIEW_JS" file="src/js/views/view.js" type="chrome_html" /> <structure name="IDR_CAMERA_WARNING_JS" file="src/js/views/warning.js" type="chrome_html" /> <structure name="IDR_CAMERA_WEBUI_BROWSER_PROXY" file="src/js/browser_proxy/webui_browser_proxy.js" type="chrome_html" /> @@ -57,19 +60,19 @@ use_base_dir="false" type="BINDATA"/> <include name="IDR_CAMERA_CAMERA_COMMON_MOJOM_LITE_JS" - file="${root_gen_dir}/media/capture/video/chromeos/mojo/camera_common.mojom-lite.js" + file="${root_gen_dir}/media/capture/video/chromeos/mojom/camera_common.mojom-lite.js" use_base_dir="false" type="BINDATA"/> <include name="IDR_CAMERA_CAMERA_METADATA_MOJOM_LITE_JS" - file="${root_gen_dir}/media/capture/video/chromeos/mojo/camera_metadata.mojom-lite.js" + file="${root_gen_dir}/media/capture/video/chromeos/mojom/camera_metadata.mojom-lite.js" use_base_dir="false" type="BINDATA"/> <include name="IDR_CAMERA_CAMERA_METADATA_TAGS_MOJOM_LITE_JS" - file="${root_gen_dir}/media/capture/video/chromeos/mojo/camera_metadata_tags.mojom-lite.js" + file="${root_gen_dir}/media/capture/video/chromeos/mojom/camera_metadata_tags.mojom-lite.js" use_base_dir="false" type="BINDATA"/> - <include name="IDR_CAMERA_CROS_IMAGE_CAPTURE_MOJOM_LITE_JS" - file="${root_gen_dir}/media/capture/video/chromeos/mojo/cros_image_capture.mojom-lite.js" + <include name="IDR_CAMERA_APP_MOJOM_LITE_JS" + file="${root_gen_dir}/media/capture/video/chromeos/mojom/camera_app.mojom-lite.js" use_base_dir="false" type="BINDATA"/> diff --git a/chromium/chrome/browser/resources/chromeos/camera/src/_locales/en/messages.json b/chromium/chrome/browser/resources/chromeos/camera/src/_locales/en/messages.json index 5a9f048411f..cf3600060c5 100644 --- a/chromium/chrome/browser/resources/chromeos/camera/src/_locales/en/messages.json +++ b/chromium/chrome/browser/resources/chromeos/camera/src/_locales/en/messages.json @@ -45,6 +45,10 @@ "message": "Nothing recorded", "description": "Error message shown when no data is recorded for a recording and it won't be added to the gallery." }, + "ERROR_MSG_EXPERT_MODE_NOT_SUPPORTED": { + "message": "Expert mode is not supported on this device", + "description": "Error message when the device does not support expert mode but tries to enable it." + }, "STATUS_MSG_RECORDING_STOPPED": { "message": "Recording stopped", "description": "Status message for spoken feedback when video recording has been stopped." @@ -103,6 +107,18 @@ "message": "Camera resolution", "description": "Label for the button of camera resolution options." }, + "EXPERT_MODE_BUTTON": { + "message": "Expert mode", + "description": "Label for the button of expert mode options." + }, + "EXPERT_PREVIEW_METADATA": { + "message": "Preview metadata", + "description": "Label for expert mode option: preview metadata." + }, + "EXPERT_SAVE_METADATA": { + "message": "Save metadata", + "description": "Label for expert mode option: save metadata." + }, "FEEDBACK_BUTTON": { "message": "Send feedback", "description": "Label for the feedback button." diff --git a/chromium/chrome/browser/resources/chromeos/camera/src/js/BUILD.gn b/chromium/chrome/browser/resources/chromeos/camera/src/js/BUILD.gn index 7a0dd53b11e..059505eb02c 100644 --- a/chromium/chrome/browser/resources/chromeos/camera/src/js/BUILD.gn +++ b/chromium/chrome/browser/resources/chromeos/camera/src/js/BUILD.gn @@ -11,13 +11,16 @@ group("closure_compile") { "device:closure_compile", "models:closure_compile", "mojo:closure_compile", + "views:closure_compile", ] } js_type_check("compile_resources") { deps = [ + ":nav", ":resolution_event_broker", ":state", + ":toast", ":tooltip", ":util", ] @@ -26,9 +29,22 @@ js_type_check("compile_resources") { js_library("resolution_event_broker") { } +js_library("nav") { + deps = [ + "mojo:device_operator", + "views:view", + ] +} + js_library("state") { } +js_library("toast") { + deps = [ + ":util", + ] +} + js_library("tooltip") { } diff --git a/chromium/chrome/browser/resources/chromeos/camera/src/js/device/BUILD.gn b/chromium/chrome/browser/resources/chromeos/camera/src/js/device/BUILD.gn index 013d454061a..cc01ba9b370 100644 --- a/chromium/chrome/browser/resources/chromeos/camera/src/js/device/BUILD.gn +++ b/chromium/chrome/browser/resources/chromeos/camera/src/js/device/BUILD.gn @@ -14,22 +14,23 @@ js_type_check("closure_compile") { js_library("camera3_device_info") { deps = [ - "../mojo:imagecapture", + "../mojo:image_capture", ] } js_library("constraints_preferrer") { deps = [ + ":camera3_device_info", "..:resolution_event_broker", + "..:state", "../browser_proxy:browser_proxy", ] } js_library("device_info_updater") { deps = [ - "..:state", - "../mojo:imagecapture", ":camera3_device_info", ":constraints_preferrer", + "..:state", ] } diff --git a/chromium/chrome/browser/resources/chromeos/camera/src/js/models/BUILD.gn b/chromium/chrome/browser/resources/chromeos/camera/src/js/models/BUILD.gn index 89ebf568fe6..db0f77e3e3f 100644 --- a/chromium/chrome/browser/resources/chromeos/camera/src/js/models/BUILD.gn +++ b/chromium/chrome/browser/resources/chromeos/camera/src/js/models/BUILD.gn @@ -9,6 +9,8 @@ js_type_check("closure_compile") { ":filenamer", ":filesystem", ":gallery", + ":result_saver", + ":video_saver", ] } @@ -26,3 +28,9 @@ js_library("gallery") { ":filesystem", ] } + +js_library("result_saver") { +} + +js_library("video_saver") { +} diff --git a/chromium/chrome/browser/resources/chromeos/camera/src/js/mojo/BUILD.gn b/chromium/chrome/browser/resources/chromeos/camera/src/js/mojo/BUILD.gn index 9d131abf33c..3be85b7f5c2 100644 --- a/chromium/chrome/browser/resources/chromeos/camera/src/js/mojo/BUILD.gn +++ b/chromium/chrome/browser/resources/chromeos/camera/src/js/mojo/BUILD.gn @@ -6,14 +6,23 @@ import("//third_party/closure_compiler/compile_js.gni") js_type_check("closure_compile") { deps = [ - ":imagecapture", + ":device_operator", + ":image_capture", ] } -js_library("imagecapture") { +js_library("device_operator") { deps = [ + "//media/capture/video/chromeos/mojom:cros_camera_js_library_for_compile", + ] + externs_list = [ "$externs_path/pending.js" ] +} + +js_library("image_capture") { + deps = [ + ":device_operator", + "..:util", "//media/capture/mojom:image_capture_js_library_for_compile", - "//media/capture/video/chromeos/mojo:cros_camera_js_library_for_compile", ] externs_list = [ "$externs_path/pending.js" ] } diff --git a/chromium/chrome/browser/resources/chromeos/camera/src/js/views/BUILD.gn b/chromium/chrome/browser/resources/chromeos/camera/src/js/views/BUILD.gn new file mode 100644 index 00000000000..84560373b2c --- /dev/null +++ b/chromium/chrome/browser/resources/chromeos/camera/src/js/views/BUILD.gn @@ -0,0 +1,23 @@ +# Copyright 2019 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//third_party/closure_compiler/compile_js.gni") + +group("closure_compile") { + deps = [ + ":compile_resources", + ] +} + +js_type_check("compile_resources") { + deps = [ + ":view", + ] +} + +js_library("view") { + deps = [ + "..:toast", + ] +} diff --git a/chromium/chrome/browser/resources/chromeos/camera/src/strings/camera_strings.grd b/chromium/chrome/browser/resources/chromeos/camera/src/strings/camera_strings.grd index 834cc2109d1..299d99fff8c 100644 --- a/chromium/chrome/browser/resources/chromeos/camera/src/strings/camera_strings.grd +++ b/chromium/chrome/browser/resources/chromeos/camera/src/strings/camera_strings.grd @@ -222,6 +222,18 @@ <message desc="Label for the checkbox to toggle the microphone for recording video." name="IDS_TOGGLE_MIC_BUTTON"> Microphone </message> + <message desc="Label for the button of expert mode options." name="IDS_EXPERT_MODE_BUTTON"> + Expert mode + </message> + <message desc="Label for expert mode option: preview metadata." name="IDS_EXPERT_PREVIEW_METADATA"> + Preview metadata + </message> + <message desc="Label for expert mode option: save metadata." name="IDS_EXPERT_SAVE_METADATA"> + Save metadata + </message> + <message desc="Error message when the device does not support expert mode but tries to enable it." name="IDS_ERROR_MSG_EXPERT_MODE_NOT_SUPPORTED"> + Expert mode is not supported on this device + </message> <message desc="Label for the feedback button." name="IDS_FEEDBACK_BUTTON"> Send feedback </message> diff --git a/chromium/chrome/browser/resources/chromeos/chromevox/BUILD.gn b/chromium/chrome/browser/resources/chromeos/chromevox/BUILD.gn index 32d9da3e2e8..39bba1fa5d9 100644 --- a/chromium/chrome/browser/resources/chromeos/chromevox/BUILD.gn +++ b/chromium/chrome/browser/resources/chromeos/chromevox/BUILD.gn @@ -146,6 +146,7 @@ chromevox_modules = [ "cvox2/background/live_regions.js", "cvox2/background/log.js", "cvox2/background/log_store.js", + "cvox2/background/log_types.js", "cvox2/background/math_handler.js", "cvox2/background/media_automation_handler.js", "cvox2/background/mouse_handler.js", diff --git a/chromium/chrome/browser/resources/chromeos/chromevox/strings/chromevox_strings.grd b/chromium/chrome/browser/resources/chromeos/chromevox/strings/chromevox_strings.grd index 83d4ec0c1ad..2028ad38ee8 100644 --- a/chromium/chrome/browser/resources/chromeos/chromevox/strings/chromevox_strings.grd +++ b/chromium/chrome/browser/resources/chromeos/chromevox/strings/chromevox_strings.grd @@ -2971,25 +2971,18 @@ If you're done with the tutorial, use ChromeVox to navigate to the Close button <message desc="Description of a command that toggles between 6 and 8 dot braille." name="IDS_CHROMEVOX_TOGGLE_BRAILLE_TABLE"> Toggle between 6 and 8 dot braille </message> - <message desc="Spoken when a user navigates to the beginning of a misspelled word." name="IDS_CHROMEVOX_MISSPELLING_START"> - Misspelling start + <message desc="Spoken when a user navigates into a misspelled word." name="IDS_CHROMEVOX_MISSPELLING_START"> + Misspelled </message> - <message desc="Spoken when a user navigates to the end of a misspelled word." name="IDS_CHROMEVOX_MISSPELLING_END"> - Misspelling end + <message desc="Spoken when a user navigates out of a misspelled word." name="IDS_CHROMEVOX_MISSPELLING_END"> + Leaving misspelled </message> - <message desc="Spoken when a user navigates to the beginning of a grammar error." name="IDS_CHROMEVOX_GRAMMAR_START"> - Grammar error start + <message desc="Spoken when a user navigates into a grammar error." name="IDS_CHROMEVOX_GRAMMAR_START"> + Grammar error </message> - <message desc="Spoken when a user navigates to the end of a grammar error." name="IDS_CHROMEVOX_GRAMMAR_END"> - Grammar error end + <message desc="Spoken when a user navigates out of a grammar error." name="IDS_CHROMEVOX_GRAMMAR_END"> + Leaving grammar error </message> - <message desc="Spoken when a user navigates to the beginning of a text match from a find in page." name="IDS_CHROMEVOX_TEXT_MATCH_START"> - Text match start - </message> - <message desc="Spoken when a user navigates to the end of a text match from a find in page." name="IDS_CHROMEVOX_TEXT_MATCH_END"> - Text match end - </message> - <message desc="Spoken to describe text that is superscript." name="IDS_CHROMEVOX_SUPERSCRIPT"> Superscript </message> @@ -3221,7 +3214,7 @@ If you're done with the tutorial, use ChromeVox to navigate to the Close button </message> <message desc="The text label for ChromeVox language switching checkbox." name="IDS_CHROMEVOX_OPTIONS_LANG_SWITCHING_CHECKBOX_LABEL"> - Automatically detect and switch ChromeVox language. + Automatically switch ChromeVox voice based on language </message> <message desc="Spoken to describe all rich text attributes of a node." name="IDS_CHROMEVOX_RICH_TEXT_ATTRIBUTES"> Text formatting. @@ -3656,10 +3649,10 @@ If you're done with the tutorial, use ChromeVox to navigate to the Close button Dodger Blue </message> <message desc="An options page section header for options about ChromeVox rich text behavior. This section lets users set preferences on how rich text attributes should be indicated." name="IDS_CHROMEVOX_OPTIONS_RICH_TEXT_HEADER"> - Rich Text Attributes + Formatting </message> <message desc="The text label for ChromeVox automatic rich text indication checkbox." name="IDS_CHROMEVOX_OPTIONS_RICH_TEXT_CHECKBOX_LABEL"> - Announce rich text attributes + Announce text styling </message> <message desc="Labels the misspell list box." name="IDS_CHROMEVOX_OPTIONS_MISSPELL_DESCRIPTION"> Indicate misspell: diff --git a/chromium/chrome/browser/resources/chromeos/genius_app/manifest.json b/chromium/chrome/browser/resources/chromeos/genius_app/manifest.json index e0f1b720490..c79cf9eda03 100644 --- a/chromium/chrome/browser/resources/chromeos/genius_app/manifest.json +++ b/chromium/chrome/browser/resources/chromeos/genius_app/manifest.json @@ -3,7 +3,7 @@ "manifest_version": 2, "name": "__MSG_app_name__", "description": "__MSG_app_description__", - "version": "0.3", + "version": "0.4", "minimum_chrome_version": "28", "default_locale": "en", "incognito" : "split", @@ -36,6 +36,7 @@ "https://*.ytimg.com/*", "https://www.google.com/*", "https://support.google.com/*", + "https://scone-pa.clients6.google.com/*", "https://commondatastorage.googleapis.com/*", "https://storage.googleapis.com/*", "https://www.google-analytics.com/" diff --git a/chromium/chrome/browser/resources/chromeos/internet_detail_dialog/BUILD.gn b/chromium/chrome/browser/resources/chromeos/internet_detail_dialog/BUILD.gn index 13434201e78..7f45f293dd0 100644 --- a/chromium/chrome/browser/resources/chromeos/internet_detail_dialog/BUILD.gn +++ b/chromium/chrome/browser/resources/chromeos/internet_detail_dialog/BUILD.gn @@ -26,7 +26,7 @@ js_library("internet_detail_dialog") { deps = [ "//ui/webui/resources/cr_elements/chromeos/network:cr_network_listener_behavior", "//ui/webui/resources/cr_elements/chromeos/network:cr_onc_types", - "//ui/webui/resources/cr_elements/policy:cr_policy_network_behavior", + "//ui/webui/resources/cr_elements/policy:cr_policy_network_behavior_mojo", "//ui/webui/resources/js:assert", "//ui/webui/resources/js:i18n_behavior", "//ui/webui/resources/js/chromeos:onc_mojo", diff --git a/chromium/chrome/browser/resources/chromeos/login/BUILD.gn b/chromium/chrome/browser/resources/chromeos/login/BUILD.gn index 16625518952..77459dd1bf6 100644 --- a/chromium/chrome/browser/resources/chromeos/login/BUILD.gn +++ b/chromium/chrome/browser/resources/chromeos/login/BUILD.gn @@ -192,7 +192,8 @@ js_library("enrollment_license_card") { js_library("fingerprint_setup") { deps = [ ":oobe_dialog_host_behavior", - "//ui/webui/resources/cr_elements/chromeos/fingerprint:cr_fingerprint_progress_arc", + "//ui/webui/resources/cr_elements/chromeos/cr_lottie:cr_lottie", + "//ui/webui/resources/cr_elements/cr_fingerprint:cr_fingerprint_progress_arc", "//ui/webui/resources/js:i18n_behavior", ] } diff --git a/chromium/chrome/browser/resources/chromeos/switch_access/BUILD.gn b/chromium/chrome/browser/resources/chromeos/switch_access/BUILD.gn index 33cef10b2fc..a38c408d0f3 100644 --- a/chromium/chrome/browser/resources/chromeos/switch_access/BUILD.gn +++ b/chromium/chrome/browser/resources/chromeos/switch_access/BUILD.gn @@ -36,7 +36,10 @@ run_jsbundler("switch_access_copied_files") { "back_button_manager.js", "background.js", "commands.js", + "focus_ring_manager.js", "icons/back.svg", + "icons/copy.svg", + "icons/cut.svg", "icons/decrement.svg", "icons/dictation.svg", "icons/increment.svg", @@ -45,29 +48,27 @@ run_jsbundler("switch_access_copied_files") { "icons/keyboard.svg", "icons/moveBackwardOneCharOfText.svg", "icons/moveBackwardOneWordOfText.svg", + "icons/moveCursor.svg", "icons/moveDownOneLineOfText.svg", "icons/moveForwardOneCharOfText.svg", "icons/moveForwardOneWordOfText.svg", "icons/moveUpOneLineOfText.svg", - "icons/options.svg", + "icons/paste.svg", "icons/scrollDownOrForward.svg", "icons/scrollLeft.svg", "icons/scrollRight.svg", "icons/scrollUpOrBackward.svg", "icons/select.svg", + "icons/settings.svg", "icons/showContextMenu.svg", "icons/textSelectionEnd.svg", "icons/textSelectionStart.svg", - "key_event_handler.js", "menu_manager.js", "menu_panel.css", "menu_panel.html", "menu_panel.js", "menu_panel_interface.js", "navigation_manager.js", - "options.css", - "options.html", - "options.js", "preferences.js", "rect_helper.js", "switch_access.js", @@ -174,12 +175,11 @@ js_type_check("closure_compile") { ":back_button_manager", ":background", ":commands", - ":key_event_handler", + ":focus_ring_manager", ":menu_manager", ":menu_panel", ":menu_panel_interface", ":navigation_manager", - ":options", ":preferences", ":rect_helper", ":switch_access", @@ -203,10 +203,12 @@ js_library("auto_scan_manager") { js_library("navigation_manager") { deps = [ ":back_button_manager", + ":focus_ring_manager", ":menu_manager", ":menu_panel_interface", ":rect_helper", ":switch_access_constants", + ":switch_access_interface", ":switch_access_predicate", ":text_input_manager", ":text_navigation_manager", @@ -242,9 +244,9 @@ js_library("commands") { ] } -js_library("key_event_handler") { +js_library("focus_ring_manager") { deps = [ - ":switch_access_interface", + ":back_button_manager", ] externs_list = [ "$externs_path/accessibility_private.js" ] } @@ -254,6 +256,7 @@ js_library("menu_manager") { ":menu_panel_interface", ":switch_access_interface", ] + externs_list = [ "$externs_path/accessibility_private.js" ] } js_library("menu_panel") { @@ -265,19 +268,11 @@ js_library("menu_panel") { js_library("menu_panel_interface") { } -js_library("options") { - deps = [ - ":background", - ":switch_access", - ] - externs_list = [ "$externs_path/chrome_extensions.js" ] -} - js_library("preferences") { deps = [ ":switch_access_interface", ] - externs_list = [ "$externs_path/chrome_extensions.js" ] + externs_list = [ "$externs_path/settings_private.js" ] } js_library("rect_helper") { @@ -288,7 +283,6 @@ js_library("switch_access") { deps = [ ":auto_scan_manager", ":commands", - ":key_event_handler", ":menu_panel_interface", ":navigation_manager", ":preferences", @@ -296,6 +290,7 @@ js_library("switch_access") { externs_list = [ "$externs_path/automation.js", "$externs_path/chrome_extensions.js", + "$externs_path/clipboard.js", "$externs_path/command_line_private.js", ] } diff --git a/chromium/chrome/browser/resources/chromeos/switch_access/strings/switch_access_strings.grd b/chromium/chrome/browser/resources/chromeos/switch_access/strings/switch_access_strings.grd index 637e823fe73..6795d3cbda3 100644 --- a/chromium/chrome/browser/resources/chromeos/switch_access/strings/switch_access_strings.grd +++ b/chromium/chrome/browser/resources/chromeos/switch_access/strings/switch_access_strings.grd @@ -162,6 +162,9 @@ <message desc="The Switch Access action to open the Switch Access settings page. Should be short." name="IDS_SWITCH_ACCESS_SETTINGS_ACTION"> Settings </message> + <message desc="The Switch Access action to show the text navigation menu for moving the text caret within a text element." name="IDS_SWITCH_ACCESS_MOVE_CURSOR"> + Move cursor + </message> <message desc="The Switch Access action for moving the text caret to the beginning of the text element." name="IDS_SWITCH_ACCESS_JUMP_TO_BEGINNING_OF_TEXT"> Jump to beginning </message> @@ -192,6 +195,15 @@ <message desc="The Switch Access action to set the end of a text selection area." name="IDS_SWITCH_ACCESS_SELECTION_END"> Selection end </message> + <message desc="The Switch Access action to cut text." name="IDS_SWITCH_ACCESS_CUT"> + Cut + </message> + <message desc="The Switch Access action to copy text." name="IDS_SWITCH_ACCESS_COPY"> + Copy + </message> + <message desc="The Switch Access action to paste text." name="IDS_SWITCH_ACCESS_PASTE"> + Paste + </message> </messages> </release> </grit> |