diff options
Diffstat (limited to 'chromium/chrome/browser/resources/chromeos')
25 files changed, 313 insertions, 55 deletions
diff --git a/chromium/chrome/browser/resources/chromeos/BUILD.gn b/chromium/chrome/browser/resources/chromeos/BUILD.gn index 6d5a60739fa..8de13aa3ad6 100644 --- a/chromium/chrome/browser/resources/chromeos/BUILD.gn +++ b/chromium/chrome/browser/resources/chromeos/BUILD.gn @@ -65,6 +65,7 @@ group("closure_compile") { "bluetooth_pairing_dialog:closure_compile", "braille_ime:closure_compile", "camera/src/js:closure_compile", + "crostini_installer:closure_compile", "internet_config_dialog:closure_compile", "internet_detail_dialog:closure_compile", "login:closure_compile", diff --git a/chromium/chrome/browser/resources/chromeos/camera/BUILD.gn b/chromium/chrome/browser/resources/chromeos/camera/BUILD.gn index d41c627794d..ad8a9d9ac16 100644 --- a/chromium/chrome/browser/resources/chromeos/camera/BUILD.gn +++ b/chromium/chrome/browser/resources/chromeos/camera/BUILD.gn @@ -79,8 +79,9 @@ copy("chrome_camera_app_images") { "src/images/camera_button_timer_on_10s.svg", "src/images/camera_button_timer_on_3s.svg", "src/images/camera_focus_aim.svg", - "src/images/camera_intro_banner_close.svg", - "src/images/camera_intro_banner_icon.svg", + "src/images/camera_intent_play_video.svg", + "src/images/camera_intent_result_cancel.svg", + "src/images/camera_intent_result_confirm.svg", "src/images/camera_mode_photo.svg", "src/images/camera_mode_portrait.svg", "src/images/camera_mode_square.svg", @@ -114,6 +115,7 @@ copy("chrome_camera_app_js") { "src/js/background.js", "src/js/gallerybutton.js", "src/js/google-analytics-bundle.js", + "src/js/intent.js", "src/js/main.js", "src/js/metrics.js", "src/js/nav.js", @@ -146,6 +148,7 @@ copy("chrome_camera_app_js_device") { "src/js/device/camera3_device_info.js", "src/js/device/constraints_preferrer.js", "src/js/device/device_info_updater.js", + "src/js/device/error.js", ] outputs = [ @@ -155,11 +158,13 @@ copy("chrome_camera_app_js_device") { copy("chrome_camera_app_js_models") { sources = [ + "src/js/models/file_video_saver.js", "src/js/models/filenamer.js", "src/js/models/filesystem.js", "src/js/models/gallery.js", + "src/js/models/intent_video_saver.js", "src/js/models/result_saver.js", - "src/js/models/video_saver.js", + "src/js/models/video_saver_interface.js", ] outputs = [ @@ -169,6 +174,7 @@ copy("chrome_camera_app_js_models") { copy("chrome_camera_app_js_mojo") { sources = [ + "src/js/mojo/chrome_helper.js", "src/js/mojo/device_operator.js", "src/js/mojo/image_capture.js", ] @@ -182,6 +188,7 @@ copy("chrome_camera_app_js_views") { sources = [ "src/js/views/browser.js", "src/js/views/camera.js", + "src/js/views/camera_intent.js", "src/js/views/dialog.js", "src/js/views/gallery_base.js", "src/js/views/settings.js", @@ -201,6 +208,7 @@ copy("chrome_camera_app_js_views_camera") { "src/js/views/camera/options.js", "src/js/views/camera/preview.js", "src/js/views/camera/recordtime.js", + "src/js/views/camera/review_result.js", "src/js/views/camera/timertick.js", ] @@ -214,7 +222,9 @@ copy("chrome_camera_app_sounds") { "src/sounds/record_end.ogg", "src/sounds/record_start.ogg", "src/sounds/shutter.ogg", - "src/sounds/tick.ogg", + "src/sounds/tick_final.ogg", + "src/sounds/tick_inc.ogg", + "src/sounds/tick_start.ogg", ] outputs = [ @@ -234,6 +244,8 @@ copy("chrome_camera_app_views") { copy("chrome_camera_app_mojo_generated") { sources = [ + "$root_gen_dir/components/arc/mojom/camera_intent.mojom-lite.js", + "$root_gen_dir/components/chromeos_camera/common/camera_app_helper.mojom-lite.js", "$root_gen_dir/media/capture/mojom/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", @@ -245,6 +257,9 @@ copy("chrome_camera_app_mojo_generated") { ] deps = [ + "//components/arc/mojom:camera_intent_js", + "//components/arc/mojom:mojom_js", + "//components/chromeos_camera/common:camera_app_helper_js", "//media/capture/mojom:image_capture_js", "//media/capture/video/chromeos/mojom:cros_camera_js", "//mojo/public/js:bindings_lite", diff --git a/chromium/chrome/browser/resources/chromeos/camera/camera_resources.grd b/chromium/chrome/browser/resources/chromeos/camera/camera_resources.grd index 0a9ac124ab1..5db7aa1386c 100644 --- a/chromium/chrome/browser/resources/chromeos/camera/camera_resources.grd +++ b/chromium/chrome/browser/resources/chromeos/camera/camera_resources.grd @@ -17,16 +17,20 @@ <structure name="IDR_CAMERA_BUNDLE_JS" file="src/js/google-analytics-bundle.js" type="chrome_html" /> <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_CAMERA_INTENT_JS" file="src/js/views/camera_intent.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_CHROME_HELPER_JS" file="src/js/mojo/chrome_helper.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_ERROR_JS" file="src/js/device/error.js" type="chrome_html" /> <structure name="IDR_CAMERA_FILENAMER_JS" file="src/js/models/filenamer.js" type="chrome_html" /> <structure name="IDR_CAMERA_FILESYSTEM_JS" file="src/js/models/filesystem.js" type="chrome_html" /> <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/image_capture.js" type="chrome_html" /> + <structure name="IDR_CAMERA_INTENT_JS" file="src/js/intent.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" /> @@ -40,6 +44,7 @@ <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_REVIEW_RESULT_JS" file="src/js/views/camera/review_result.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" /> @@ -48,13 +53,19 @@ <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_VIDEO_SAVER_INTERFACE_JS" file="src/js/models/video_saver_interface.js" type="chrome_html" /> + <structure name="IDR_CAMERA_INTENT_VIDEO_SAVER_JS" file="src/js/models/file_video_saver.js" type="chrome_html" /> + <structure name="IDR_CAMERA_FILE_VIDEO_SAVER_JS" file="src/js/models/intent_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" /> </structures> <includes> <!-- Mojo Lite Bindings --> + <include name="IDR_CAMERA_CAMERA_INTENT_MOJOM_LITE_JS" + file="${root_gen_dir}/components/arc/mojom/camera_intent.mojom-lite.js" + use_base_dir="false" + type="BINDATA"/> <include name="IDR_CAMERA_IMAGE_CAPTURE_MOJOM_LITE_JS" file="${root_gen_dir}/media/capture/mojom/image_capture.mojom-lite.js" use_base_dir="false" @@ -79,14 +90,15 @@ <include name="IDR_CAMERA_RECORD_END_OGG" file="src/sounds/record_end.ogg" type="BINDATA" /> <include name="IDR_CAMERA_RECORD_START_OGG" file="src/sounds/record_start.ogg" type="BINDATA" /> <include name="IDR_CAMERA_SHUTTER_OGG" file="src/sounds/shutter.ogg" type="BINDATA" /> - <include name="IDR_CAMERA_TICK_OGG" file="src/sounds/tick.ogg" type="BINDATA" /> + <include name="IDR_CAMERA_TICK_FINAL_OGG" file="src/sounds/tick_final.ogg" type="BINDATA" /> + <include name="IDR_CAMERA_TICK_INC_OGG" file="src/sounds/tick_inc.ogg" type="BINDATA" /> + <include name="IDR_CAMERA_TICK_START_OGG" file="src/sounds/tick_start.ogg" type="BINDATA" /> <include name="IDR_CAMERA_CAMERA_MODE_SQUARE_SVG" file="src/images/camera_mode_square.svg" type="BINDATA" /> <include name="IDR_CAMERA_SETTINGS_BUTTON_BACK_SVG" file="src/images/settings_button_back.svg" type="BINDATA" /> <include name="IDR_CAMERA_CAMERA_MODE_PORTRAIT_SVG" file="src/images/camera_mode_portrait.svg" type="BINDATA" /> <include name="IDR_CAMERA_CAMERA_BUTTON_TIMER_ON_3S_SVG" file="src/images/camera_button_timer_on_3s.svg" type="BINDATA" /> <include name="IDR_CAMERA_CAMERA_SHUTTER_VIDEO_START_HOVER_SVG" file="src/images/camera_shutter_video_start_hover.svg" type="BINDATA" /> <include name="IDR_CAMERA_SPINNER_SVG" file="src/images/spinner.svg" type="BINDATA" /> - <include name="IDR_CAMERA_CAMERA_INTRO_BANNER_ICON_SVG" file="src/images/camera_intro_banner_icon.svg" type="BINDATA" /> <include name="IDR_CAMERA_CAMERA_BUTTON_GRID_OFF_SVG" file="src/images/camera_button_grid_off.svg" type="BINDATA" /> <include name="IDR_CAMERA_CAMERA_BUTTON_MIC_ON_SVG" file="src/images/camera_button_mic_on.svg" type="BINDATA" /> <include name="IDR_CAMERA_BROWSER_BUTTON_DELETE_SVG" file="src/images/browser_button_delete.svg" type="BINDATA" /> @@ -110,7 +122,6 @@ <include name="IDR_CAMERA_SETTINGS_GRID_TYPE_SVG" file="src/images/settings_grid_type.svg" type="BINDATA" /> <include name="IDR_CAMERA_CAMERA_BUTTON_MIRROR_OFF_SVG" file="src/images/camera_button_mirror_off.svg" type="BINDATA" /> <include name="IDR_CAMERA_BROWSER_BUTTON_EXPORT_SVG" file="src/images/browser_button_export.svg" type="BINDATA" /> - <include name="IDR_CAMERA_CAMERA_INTRO_BANNER_CLOSE_SVG" file="src/images/camera_intro_banner_close.svg" type="BINDATA" /> <include name="IDR_CAMERA_CAMERA_SHUTTER_PHOTO_START_SVG" file="src/images/camera_shutter_photo_start.svg" type="BINDATA" /> <include name="IDR_CAMERA_BROWSER_BUTTON_BACK_SVG" file="src/images/browser_button_back.svg" type="BINDATA" /> <include name="IDR_CAMERA_CAMERA_SHUTTER_VIDEO_STOP_SVG" file="src/images/camera_shutter_video_stop.svg" 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 cf3600060c5..3a824bee776 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 @@ -95,6 +95,14 @@ "message": "Grid type", "description": "Label for the button of grid-type options." }, + "LABEL_30FPS": { + "message": "30 FPS", + "description": "Label showing current state of 30 FPS on tooltip of toggle 60 FPS recording checkbox." + }, + "LABEL_60FPS": { + "message": "60 FPS", + "description": "Label showing current state of 60 FPS on tooltip of toggle 60 FPS recording checkbox." + }, "TOGGLE_60FPS_BUTTON": { "message": "60 FPS", "description": "Label for the checkbox to toggle 60 FPS recording." @@ -333,20 +341,16 @@ "message": "Photos and videos taken with the camera will be moved to the Downloads folder. You can access them in Files.\n\nApps with storage permissions will have access to your photos and videos.", "description": "Message shown before moving all photos and videos stored in the Camera App to the Downloads folder." }, - "BANNER_TITLE": { - "message": "A whole new look", - "description": "Title of banner shown for introducing new camera App UI." + "CONFIRM_REVIEW_BUTTON": { + "message": "Confirm", + "description": "Label for the confirm button to confirm with the reviewed photo or video." }, - "BANNER_MSG": { - "message": "Your camera now supports new modes and your photos and videos will be available under your Downloads folders.", - "description": "Message in the banner shown for introducing new camera App UI." - }, - "BANNER_CLOSE_BUTTON": { - "message": "Close", - "description": "Label for close introducing new camera App UI banner button." + "CANCEL_REVIEW_BUTTON": { + "message": "Cancel", + "description": "Label for the cancel button to cancel with the reviewed photo or video." }, - "BANNER_LEARN_MORE_BUTTON": { - "message": "Learn more", - "description": "Label for learn more about new camera App UI button." + "PLAY_RESULT_VIDEO_BUTTON": { + "message": "Play video", + "description": "Label for the button to play video." } }
\ No newline at end of file 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 059505eb02c..7ea176a9a3f 100644 --- a/chromium/chrome/browser/resources/chromeos/camera/src/js/BUILD.gn +++ b/chromium/chrome/browser/resources/chromeos/camera/src/js/BUILD.gn @@ -17,6 +17,9 @@ group("closure_compile") { js_type_check("compile_resources") { deps = [ + ":background", + ":intent", + ":metrics", ":nav", ":resolution_event_broker", ":state", @@ -26,6 +29,18 @@ js_type_check("compile_resources") { ] } +js_library("intent") { + deps = [ + "mojo:chrome_helper", + ] +} + +js_library("metrics") { + deps = [ + "externs:chrome_platform_analytics", + ] +} + js_library("resolution_event_broker") { } @@ -39,6 +54,12 @@ js_library("nav") { js_library("state") { } +js_library("background") { + deps = [ + ":intent", + ] +} + js_library("toast") { deps = [ ":util", @@ -52,6 +73,7 @@ js_library("util") { deps = [ ":tooltip", "browser_proxy:browser_proxy", + "mojo:chrome_helper", ] externs_list = [ "$externs_path/chrome_extensions.js" ] } 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 cc01ba9b370..a54df9607b7 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 @@ -9,6 +9,7 @@ js_type_check("closure_compile") { ":camera3_device_info", ":constraints_preferrer", ":device_info_updater", + ":error", ] } @@ -31,6 +32,10 @@ js_library("device_info_updater") { deps = [ ":camera3_device_info", ":constraints_preferrer", + ":error", "..:state", ] } + +js_library("error") { +} diff --git a/chromium/chrome/browser/resources/chromeos/camera/src/js/externs/BUILD.gn b/chromium/chrome/browser/resources/chromeos/camera/src/js/externs/BUILD.gn new file mode 100644 index 00000000000..e41499011b1 --- /dev/null +++ b/chromium/chrome/browser/resources/chromeos/camera/src/js/externs/BUILD.gn @@ -0,0 +1,11 @@ +# 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") + +js_library("chrome_platform_analytics") { + sources = [] + + externs_list = [ "chrome_platform_analytics.js" ] +} 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 db0f77e3e3f..39e60221b1d 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 @@ -33,4 +33,12 @@ js_library("result_saver") { } js_library("video_saver") { + sources = [ + "file_video_saver.js", + "intent_video_saver.js", + "video_saver_interface.js", + ] + deps = [ + "..:intent", + ] } 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 3be85b7f5c2..ba8aca34aad 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,11 +6,20 @@ import("//third_party/closure_compiler/compile_js.gni") js_type_check("closure_compile") { deps = [ + ":chrome_helper", ":device_operator", ":image_capture", ] } +js_library("chrome_helper") { + deps = [ + "//components/arc/mojom:camera_intent_js_library_for_compile", + "//components/chromeos_camera/common:camera_app_helper_js_library_for_compile", + ] + externs_list = [ "$externs_path/pending.js" ] +} + js_library("device_operator") { deps = [ "//media/capture/video/chromeos/mojom:cros_camera_js_library_for_compile", 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 index 84560373b2c..d52516bb184 100644 --- a/chromium/chrome/browser/resources/chromeos/camera/src/js/views/BUILD.gn +++ b/chromium/chrome/browser/resources/chromeos/camera/src/js/views/BUILD.gn @@ -7,6 +7,7 @@ import("//third_party/closure_compiler/compile_js.gni") group("closure_compile") { deps = [ ":compile_resources", + "camera:compile_resources", ] } diff --git a/chromium/chrome/browser/resources/chromeos/camera/src/js/views/camera/BUILD.gn b/chromium/chrome/browser/resources/chromeos/camera/src/js/views/camera/BUILD.gn new file mode 100644 index 00000000000..38a22c262b9 --- /dev/null +++ b/chromium/chrome/browser/resources/chromeos/camera/src/js/views/camera/BUILD.gn @@ -0,0 +1,24 @@ +# 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 = [ + ":review_result", + ] +} + +js_library("review_result") { + deps = [ + "../..:state", + "../..:util", + ] +} diff --git a/chromium/chrome/browser/resources/chromeos/camera/src/manifest.json b/chromium/chrome/browser/resources/chromeos/camera/src/manifest.json index 412686f9bed..f0c5c272c5b 100644 --- a/chromium/chrome/browser/resources/chromeos/camera/src/manifest.json +++ b/chromium/chrome/browser/resources/chromeos/camera/src/manifest.json @@ -25,7 +25,14 @@ ], "app": { "background": { - "scripts": ["js/background.js"] + "scripts": [ + "js/mojo/mojo_bindings_lite.js", + "js/mojo/camera_intent.mojom-lite.js", + "js/mojo/camera_app_helper.mojom-lite.js", + "js/mojo/chrome_helper.js", + "js/intent.js", + "js/background.js" + ] } } } 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 299d99fff8c..f5c800a6df4 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 @@ -297,6 +297,12 @@ <message desc="Label for the button of grid-type options." name="IDS_GRID_TYPE_BUTTON"> Grid type </message> + <message desc="Label showing current state of 30 FPS on tooltip of toggle 60 FPS recording checkbox." name="IDS_LABEL_30FPS"> + 30 FPS + </message> + <message desc="Label showing current state of 60 FPS on tooltip of toggle 60 FPS recording checkbox." name="IDS_LABEL_60FPS"> + 60 FPS + </message> <message desc="Label for the checkbox to toggle 60 FPS recording." name="IDS_TOGGLE_60FPS_BUTTON"> 60 FPS </message> @@ -315,17 +321,14 @@ <message desc="Label for switch to take portrait photo mode button." name="IDS_LABEL_SWITCH_TAKE_PORTRAIT_PHOTO_BUTTON"> Portrait </message> - <message desc="Title of banner shown for introducing new camera App UI." name="IDS_BANNER_TITLE"> - A whole new look + <message desc="Label for the confirm button to confirm with the reviewed photo or video." name="IDS_CONFIRM_REVIEW_BUTTON"> + Confirm </message> - <message desc="Message in the banner shown for introducing new camera App UI." name="IDS_BANNER_MSG"> - Your camera now supports new modes and your photos and videos will be available under your Downloads folders. - </message> - <message desc="Label for close introducing new camera App UI banner button." name="IDS_BANNER_CLOSE_BUTTON"> - Close + <message desc="Label for the cancel button to cancel with the reviewed photo or video." name="IDS_CANCEL_REVIEW_BUTTON"> + Cancel </message> - <message desc="Label for learn more about new camera App UI button." name="IDS_BANNER_LEARN_MORE_BUTTON"> - Learn more + <message desc="Label for the button to play video." name="IDS_PLAY_RESULT_VIDEO_BUTTON"> + Play video </message> </messages> </release> diff --git a/chromium/chrome/browser/resources/chromeos/chromevox/BUILD.gn b/chromium/chrome/browser/resources/chromeos/chromevox/BUILD.gn index 39bba1fa5d9..5210a02ce52 100644 --- a/chromium/chrome/browser/resources/chromeos/chromevox/BUILD.gn +++ b/chromium/chrome/browser/resources/chromeos/chromevox/BUILD.gn @@ -158,6 +158,7 @@ chromevox_modules = [ "cvox2/background/panel_command.js", "cvox2/background/panel_menu.js", "cvox2/background/panel_menu_item.js", + "cvox2/background/phonetic_data.js", "cvox2/background/recovery_strategy.js", "cvox2/background/tree_dumper.js", "cvox2/background/tree_walker.js", @@ -187,6 +188,7 @@ chromevox_modules = [ "host/interface/braille_interface.js", "host/interface/host_factory.js", "host/interface/tts_interface.js", + "third_party/tamachiyomi/ja_phonetic_data.js", "walkers/abstract_node_walker.js", "walkers/abstract_selection_walker.js", "walkers/abstract_shifter.js", diff --git a/chromium/chrome/browser/resources/chromeos/chromevox/chromevox/background/keymaps/next_keymap.json b/chromium/chrome/browser/resources/chromeos/chromevox/chromevox/background/keymaps/next_keymap.json index ddee7a20815..f049fa2f5b9 100644 --- a/chromium/chrome/browser/resources/chromeos/chromevox/chromevox/background/keymaps/next_keymap.json +++ b/chromium/chrome/browser/resources/chromeos/chromevox/chromevox/background/keymaps/next_keymap.json @@ -924,6 +924,25 @@ } }, { + "command": "previousSimilarItem", + "sequence": { + "cvoxModifier": true, + "keys": { + "keyCode": [73], + "shiftKey": [true] + } + } + }, + { + "command": "nextSimilarItem", + "sequence": { + "cvoxModifier": true, + "keys": { + "keyCode": [73] + } + } + }, + { "command": "jumpToDetails", "sequence": { "cvoxModifier": true, @@ -998,7 +1017,7 @@ } }, { - "command": "getBatteryDescription", + "command": "announceBatteryDescription", "sequence": { "cvoxModifier": true, "keys": { @@ -1007,13 +1026,22 @@ } }, { - "command": "getRichTextDescription", + "command": "announceRichTextDescription", "sequence": { "cvoxModifier": true, "keys": { "keyCode": [65, 70] } } + }, + { + "command": "readPhoneticPronunciation", + "sequence": { + "cvoxModifier": true, + "keys": { + "keyCode": [65, 67] + } + } } ] } 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 2028ad38ee8..60b38c2f415 100644 --- a/chromium/chrome/browser/resources/chromeos/chromevox/strings/chromevox_strings.grd +++ b/chromium/chrome/browser/resources/chromeos/chromevox/strings/chromevox_strings.grd @@ -1072,6 +1072,21 @@ <message desc="This is an abbreviated ARIA widget role name shown on a braille display. When translating, try to find a contracted form of the translation for 'alert dialog' according to local conventions. If reasonable, use all lowercase and avoid punctuation to keep the number of characters as low as possible." name="IDS_CHROMEVOX_ROLE_ALERTDIALOG_BRL"> alrt dlg </message> + <message desc="Accessibility role description for attribution, meaning authoring information tied to specific content" name="IDS_CHROMEVOX_ROLE_ANNOTATION_ATTRIBUTION"> + Authoring info + </message> + <message desc="Accessibility role description for commentary" name="IDS_CHROMEVOX_ROLE_ANNOTATION_COMMENTARY"> + Comments + </message> + <message desc="Accessibility role description for presence, meaning information about another collaborator who is currently reviewing or editing this content" name="IDS_CHROMEVOX_ROLE_ANNOTATION_PRESENCE"> + Live presence + </message> + <message desc="Accessibility role description for revision, meaining historical change info tied to this content" name="IDS_CHROMEVOX_ROLE_ANNOTATION_REVISION"> + Revision + </message> + <message desc="Accessibility role description for suggestion, meaning a suggested change to some content" name="IDS_CHROMEVOX_ROLE_ANNOTATION_SUGGESTION" > + Suggestion + </message> <message desc="Describes an element with the ARIA role button." name="IDS_CHROMEVOX_ROLE_BUTTON"> Button </message> @@ -1900,6 +1915,8 @@ <message desc="In an editable text box, describes a line with only whitespace." name="IDS_CHROMEVOX_TEXT_BOX_WHITESPACE" meaning="UI element"> Space </message> + <!-- TODO(crbug.com/999781): The following 3 messages are combined with other message fragments. --> + <!-- Combining message fragments is a I18N code-smell. Combine fragments into a single message. --> <message desc="Further describes a list-like element with a number of items. e.g. This will be combined with other messages to produce: List with 3 items." name="IDS_CHROMEVOX_LIST_WITH_ITEMS_NOT_PLURALIZED"> with <ph name="num">$1</ph> items </message> @@ -1907,10 +1924,11 @@ +<ph name="num">$1</ph> </message> <message desc="Further describes a list-like element with a number of items. e.g. This will be combined with other messages to produce: List with 3 items." name="IDS_CHROMEVOX_LIST_WITH_ITEMS"> - with {COUNT, plural, =1 {# item}other {# items}} + {COUNT, plural, =1{with # item} other{with # items}} </message> + <!-- TODO(crbug.com/999781): This should not need ICU msg format. Fix where the message is used. --> <message desc="Further describes a list-like element with a number of items in braille." name="IDS_CHROMEVOX_LIST_WITH_ITEMS_BRL"> - +{COUNT, plural, =1 {#}other {#}} + {COUNT, plural, =1{+#} other{+#}} </message> <message desc="Describes the state of a progress bar, in percent." name="IDS_CHROMEVOX_STATE_PERCENT"> <ph name="num">$1</ph>% @@ -2275,6 +2293,12 @@ <message desc="The description of the next group command. Displayed in the Options page." name="IDS_CHROMEVOX_NEXT_GROUP"> Next Group </message> + <message desc="The description of the previous similar command." name="IDS_CHROMEVOX_PREVIOUS_SIMILAR_ITEM"> + Previous similar item + </message> + <message desc="The description of the next similar item command." name="IDS_CHROMEVOX_NEXT_SIMILAR_ITEM"> + Next similar item + </message> <message desc="Describes nodes or anything describing them as a landmark." name="IDS_CHROMEVOX_ROLE_LANDMARK"> Landmark </message> @@ -3706,6 +3730,21 @@ If you're done with the tutorial, use ChromeVox to navigate to the Close button <message desc="Appends language in front of content." name="IDS_CHROMEVOX_LANGUAGE_SWITCH"> <ph name="language">$1<ex>English</ex></ph>: <ph name="content">$2<ex>This is example content</ex></ph> </message> + <message desc="The description of the readPhoneticPronunciation key. Displayed in the ChromeVox menu." name="IDS_CHROMEVOX_READ_PHONETIC_PRONUNCIATION"> + Announce phonetic pronunciation for word + </message> + <message desc="Spoken to inform the user that the node's name is empty" name="IDS_CHROMEVOX_EMPTY_NAME"> + No available text for this item + </message> + <message desc="The description of the announceBatteryDescription key. Displayed in the ChromeVox menu." name="IDS_CHROMEVOX_ANNOUNCE_BATTERY_DESCRIPTION"> + Announce current battery status + </message> + <message desc="The description of the announceRichTextDescription key. Displayed in the ChromeVox menu." name="IDS_CHROMEVOX_ANNOUNCE_RICH_TEXT_DESCRIPTION"> + Announce formatting for current item + </message> + <message desc="Announced when there is no available voice for a language." name="IDS_CHROMEVOX_VOICE_UNAVAILABLE_FOR_LANGUAGE"> + No voice available for language: <ph name="language">$1<ex>English</ex></ph> + </message> </messages> </release> </grit> diff --git a/chromium/chrome/browser/resources/chromeos/crostini_installer/BUILD.gn b/chromium/chrome/browser/resources/chromeos/crostini_installer/BUILD.gn new file mode 100644 index 00000000000..2ce6341b27d --- /dev/null +++ b/chromium/chrome/browser/resources/chromeos/crostini_installer/BUILD.gn @@ -0,0 +1,44 @@ +# 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") +import("//tools/polymer/polymer.gni") + +js_type_check("closure_compile") { + is_polymer3 = true + closure_flags = default_closure_args + [ + "js_module_root=../../chrome/browser/resources/chromeos/crostini_installer/", + "js_module_root=./gen/chrome/browser/resources/chromeos/crostini_installer/", + ] + deps = [ + ":app", + ":browser_proxy", + ] +} + +js_library("app") { + deps = [ + ":browser_proxy", + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + ] +} + +js_library("browser_proxy") { + deps = [ + "//chrome/browser/ui/webui/chromeos/crostini_installer:mojo_bindings_js_library_for_compile", + "//ui/webui/resources/js:cr.m", + ] +} + +polymer_modulizer("app") { + js_file = "app.js" + html_file = "app.html" + html_type = "v3-ready" +} + +group("polymer3_elements") { + deps = [ + ":app_module", + ] +} diff --git a/chromium/chrome/browser/resources/chromeos/input_method/google_xkb_manifest.json b/chromium/chrome/browser/resources/chromeos/input_method/google_xkb_manifest.json index e59dd858d6c..5aae7aca66d 100644 --- a/chromium/chrome/browser/resources/chromeos/input_method/google_xkb_manifest.json +++ b/chromium/chrome/browser/resources/chromeos/input_method/google_xkb_manifest.json @@ -617,7 +617,8 @@ "id": "xkb:es::spa", "description": "", "language": [ - "es" + "es", + "es-ES" ], "layouts": [ "es" @@ -629,7 +630,7 @@ "name": "__MSG_keyboard_catalan__", "type": "ime", "id": "xkb:es:cat:cat", - "indicator": "CAS", + "indicator": "CAT", "description": "", "language": [ "ca" diff --git a/chromium/chrome/browser/resources/chromeos/input_method/xkb_manifest.json b/chromium/chrome/browser/resources/chromeos/input_method/xkb_manifest.json index 0bc467ac313..ca18e770961 100644 --- a/chromium/chrome/browser/resources/chromeos/input_method/xkb_manifest.json +++ b/chromium/chrome/browser/resources/chromeos/input_method/xkb_manifest.json @@ -483,7 +483,8 @@ "id": "xkb:es::spa", "description": "", "language": [ - "es" + "es", + "es-ES" ], "layouts": [ "es" @@ -494,7 +495,7 @@ "name": "__MSG_keyboard_catalan__", "type": "ime", "id": "xkb:es:cat:cat", - "indicator": "CAS", + "indicator": "CAT", "description": "", "language": [ "ca" diff --git a/chromium/chrome/browser/resources/chromeos/internet_config_dialog/BUILD.gn b/chromium/chrome/browser/resources/chromeos/internet_config_dialog/BUILD.gn index 02db3721b9f..5137ae377cc 100644 --- a/chromium/chrome/browser/resources/chromeos/internet_config_dialog/BUILD.gn +++ b/chromium/chrome/browser/resources/chromeos/internet_config_dialog/BUILD.gn @@ -25,9 +25,8 @@ js_type_check("closure_compile") { js_library("internet_config_dialog") { deps = [ "//ui/webui/resources/cr_components/chromeos/network:network_config", - "//ui/webui/resources/cr_elements/chromeos/network:cr_onc_types", "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog", - "//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", ] 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 7f45f293dd0..c292ee7e2d0 100644 --- a/chromium/chrome/browser/resources/chromeos/internet_detail_dialog/BUILD.gn +++ b/chromium/chrome/browser/resources/chromeos/internet_detail_dialog/BUILD.gn @@ -25,15 +25,11 @@ js_type_check("closure_compile") { 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/chromeos/network:cr_onc_strings", "//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", ] - externs_list = [ - "$externs_path/chrome_send.js", - "$externs_path/networking_private.js", - ] - extra_sources = [ "$interfaces_path/networking_private_interface.js" ] + externs_list = [ "$externs_path/chrome_send.js" ] } diff --git a/chromium/chrome/browser/resources/chromeos/login/BUILD.gn b/chromium/chrome/browser/resources/chromeos/login/BUILD.gn index 77459dd1bf6..a37b11a9538 100644 --- a/chromium/chrome/browser/resources/chromeos/login/BUILD.gn +++ b/chromium/chrome/browser/resources/chromeos/login/BUILD.gn @@ -235,7 +235,7 @@ js_library("navigation_bar") { js_library("network_select_login") { deps = [ "//ui/webui/resources/cr_elements/chromeos/network:cr_network_select", - "//ui/webui/resources/cr_elements/chromeos/network:cr_onc_types", + "//ui/webui/resources/cr_elements/chromeos/network:cr_onc_strings", "//ui/webui/resources/js/chromeos:onc_mojo", ] } diff --git a/chromium/chrome/browser/resources/chromeos/network_ui/BUILD.gn b/chromium/chrome/browser/resources/chromeos/network_ui/BUILD.gn index 199569c5a92..dcc92a7bfb2 100644 --- a/chromium/chrome/browser/resources/chromeos/network_ui/BUILD.gn +++ b/chromium/chrome/browser/resources/chromeos/network_ui/BUILD.gn @@ -15,7 +15,7 @@ js_library("network_ui") { "//chromeos/services/network_config/public/mojom:mojom_js_library_for_compile", "//ui/webui/resources/cr_components/chromeos/network:mojo_interface_provider", "//ui/webui/resources/cr_elements/chromeos/network:cr_network_icon", - "//ui/webui/resources/cr_elements/chromeos/network:cr_onc_types", + "//ui/webui/resources/cr_elements/chromeos/network:cr_onc_strings", "//ui/webui/resources/js:load_time_data", "//ui/webui/resources/js:util", "//ui/webui/resources/js/chromeos:onc_mojo", diff --git a/chromium/chrome/browser/resources/chromeos/set_time_dialog/BUILD.gn b/chromium/chrome/browser/resources/chromeos/set_time_dialog/BUILD.gn index 7e924f7353c..ce57213b9dc 100644 --- a/chromium/chrome/browser/resources/chromeos/set_time_dialog/BUILD.gn +++ b/chromium/chrome/browser/resources/chromeos/set_time_dialog/BUILD.gn @@ -3,8 +3,10 @@ # found in the LICENSE file. import("//third_party/closure_compiler/compile_js.gni") +import("//tools/polymer/polymer.gni") js_type_check("closure_compile") { + is_polymer3 = true deps = [ ":set_time_browser_proxy", ":set_time_dialog", @@ -14,17 +16,29 @@ js_type_check("closure_compile") { js_library("set_time_dialog") { deps = [ ":set_time_browser_proxy", - "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog", - "//ui/webui/resources/js:assert", - "//ui/webui/resources/js:cr", - "//ui/webui/resources/js:load_time_data", - "//ui/webui/resources/js:web_ui_listener_behavior", + "//ui/webui/resources/cr_elements/cr_dialog:cr_dialog.m", + "//ui/webui/resources/js:assert.m", + "//ui/webui/resources/js:cr.m", + "//ui/webui/resources/js:load_time_data.m", + "//ui/webui/resources/js:web_ui_listener_behavior.m", ] } js_library("set_time_browser_proxy") { deps = [ - "//ui/webui/resources/js:cr", + "//ui/webui/resources/js:cr.m", ] externs_list = [ "$externs_path/chrome_send.js" ] } + +polymer_modulizer("set_time_dialog") { + js_file = "set_time_dialog.js" + html_file = "set_time_dialog.html" + html_type = "v3-ready" +} + +group("polymer3_elements") { + deps = [ + ":set_time_dialog_module", + ] +} diff --git a/chromium/chrome/browser/resources/chromeos/switch_access/BUILD.gn b/chromium/chrome/browser/resources/chromeos/switch_access/BUILD.gn index a38c408d0f3..34d99739608 100644 --- a/chromium/chrome/browser/resources/chromeos/switch_access/BUILD.gn +++ b/chromium/chrome/browser/resources/chromeos/switch_access/BUILD.gn @@ -36,6 +36,7 @@ run_jsbundler("switch_access_copied_files") { "back_button_manager.js", "background.js", "commands.js", + "event_helper.js", "focus_ring_manager.js", "icons/back.svg", "icons/copy.svg", @@ -175,6 +176,7 @@ js_type_check("closure_compile") { ":back_button_manager", ":background", ":commands", + ":event_helper", ":focus_ring_manager", ":menu_manager", ":menu_panel", @@ -203,6 +205,7 @@ js_library("auto_scan_manager") { js_library("navigation_manager") { deps = [ ":back_button_manager", + ":event_helper", ":focus_ring_manager", ":menu_manager", ":menu_panel_interface", @@ -231,6 +234,7 @@ js_library("background") { js_library("back_button_manager") { deps = [ ":menu_panel_interface", + ":rect_helper", ] externs_list = [ "$externs_path/accessibility_private.js", @@ -244,6 +248,10 @@ js_library("commands") { ] } +js_library("event_helper") { + externs_list = [ "$externs_path/automation.js" ] +} + js_library("focus_ring_manager") { deps = [ ":back_button_manager", @@ -254,6 +262,7 @@ js_library("focus_ring_manager") { js_library("menu_manager") { deps = [ ":menu_panel_interface", + ":rect_helper", ":switch_access_interface", ] externs_list = [ "$externs_path/accessibility_private.js" ] @@ -309,11 +318,15 @@ js_library("switch_access_predicate") { } js_library("text_input_manager") { + deps = [ + ":event_helper", + ] externs_list = [ "$externs_path/accessibility_private.js" ] } js_library("text_navigation_manager") { deps = [ + ":event_helper", ":switch_access_constants", ] externs_list = [ "$externs_path/accessibility_private.js" ] |