diff options
Diffstat (limited to 'chromium/chrome/browser/resources/chromeos')
32 files changed, 440 insertions, 1541 deletions
diff --git a/chromium/chrome/browser/resources/chromeos/BUILD.gn b/chromium/chrome/browser/resources/chromeos/BUILD.gn index d4f57c718a8..675d9ee14d8 100644 --- a/chromium/chrome/browser/resources/chromeos/BUILD.gn +++ b/chromium/chrome/browser/resources/chromeos/BUILD.gn @@ -34,29 +34,6 @@ grit("multidevice_setup_resources") { output_dir = "$root_gen_dir/chrome" } -grit("camera_resources") { - source = "camera/camera_resources.grd" - - defines = chrome_grit_defines - outputs = [ - "grit/camera_resources.h", - "grit/camera_resources_map.cc", - "grit/camera_resources_map.h", - "camera_resources.pak", - ] - output_dir = "$root_gen_dir/chrome" - - deps = [ - "//components/arc/mojom:camera_intent_js", - "//media/capture/video/chromeos/mojom:cros_camera_js", - ] - - grit_flags = [ - "-E", - "root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir), - ] -} - group("closure_compile") { deps = [ "accessibility/braille_ime:closure_compile", @@ -64,7 +41,6 @@ group("closure_compile") { "accessibility/switch_access:closure_compile", "add_supervision:closure_compile", "bluetooth_pairing_dialog:closure_compile", - "camera/src/js:closure_compile", "crostini_installer:closure_compile", "edu_login:closure_compile", "emulator:closure_compile", diff --git a/chromium/chrome/browser/resources/chromeos/accessibility/BUILD.gn b/chromium/chrome/browser/resources/chromeos/accessibility/BUILD.gn index 0f4967d66af..31961f1aae2 100644 --- a/chromium/chrome/browser/resources/chromeos/accessibility/BUILD.gn +++ b/chromium/chrome/browser/resources/chromeos/accessibility/BUILD.gn @@ -21,11 +21,13 @@ group("build") { ] if (is_chromeos) { deps += [ + ":accessibility_common_guest_manifest", + ":accessibility_common_manifest", ":select_to_speak_guest_manifest", ":select_to_speak_manifest", ":switch_access_guest_manifest", ":switch_access_manifest", - "autoclick:build", + "accessibility_common:build", "select_to_speak:build", "switch_access:build", ] @@ -58,6 +60,20 @@ template("manifest") { } } +manifest("accessibility_common_manifest") { + input_file = "accessibility_common_manifest.json.jinja2" + output_file = "$accessibility_out_dir/accessibility_common_manifest.json" + key = "MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC6SX/t6kDEi9UiG4fULwjbEW1uJmQoiJPtxvSZ/SDH14OjSzmfP6xfE97Hus3EY8uSIMxTHkGaZliGbFbIQXQn6/XwBpQRu2gPlrfz7TWR1Hw6SboBBMOpltM9A2nx+d3jLtz+YtKNYVcHyNil9hXfFeyFe6g5kLHapKb1UO0jo3q3kovo1a1z7ujzGwogfLmb58w1hkdFBnnqumRlT55dKLN8AQ6cSdB1sjDVoMgPYeWgkzXr9cR3A8UVJookSO0sDAmD+W8BtBijapt3UVkHiIL1NTPuXvGGUHL7TPFo5WcBXFMkTz74gJqqFdO5hQ2YWXAaCxQJwgJrQPrvPMSJAgMBAAECggEADDhEDww9wWbWzUz3BQEs2In1HrOgAFStN3zEkNFc9B78AJsvpXWczgPUqk9jrg1JzkUeghlK/mDWT8MNkkdQ4kmFMYCM9/jOI6+kU3js+arxlzU84VI5r4c4RhlSOtBEMOHjF0DORP3sopMXOxPAbYjXog3xhA0szYXdedwcIik7Xu3lt1Hl5FfVZbvVLdf4vw0jTfHcp8SmHy/BDVnSCrhC3pnPGi6o+lUaSK0ca3uvcJDZGLXJ/6LyFb6uLlS2XUoBMYsombioRKrerJJSOmMTLHvfu1cM6+iQ+J0wdBnJQpgmDoSVGjnksPU2SMpWgG2OzwuZYIUGI745s19wLQKBgQDvdHsMZ4ttBr9bjydzeZVATWTICHZgXdAYgfgrbGwppYDUjfKoAuJ6bHTvff4nj8aZrY+Y1SwuvqxgHHfiggUgqg+JyeaAdQG+CLdfl1M8An+6H0x/hx0nk0oOJQhu0y1R/SbtnDJ6JASszg/VrTwHIYbzUl6xKHbZ6X41apyLYwKBgQDHKJOeZdxuYj7AsAqFGreuPoAEh0S+2VHHi4rjNz5dC1z7o/8siixfkHg7ONM2hqCKo55XYj4UWtprEFZJ9ohbizHELNzpnTxjdS0cG/VfItml6CDJaUtrkShIx17yGjNi0u/7ywHQ3slJsUXu7CbEcESwEzdoSrsC048dyxBSIwKBgF0141wtxklXcg/LBtldf6q7NbrkCGh0vDd+CEOm/eesRBz5cHbUQKLVKyO60L9HqVBTDm24tW0wzdrP2h7y69oOOOQzEqX4Zgg6Tl9IgZ7/fgbOfjG6P7ATFqWw5rp1O9QJjii6P6/p62P1Bpbvy0kfVO/MpY2iqbkjufxDFtLvAoGBAMC5p4CVGedH82oL8WI1JKLdoIzBSelV7CmqA9E1WIg5wtVRMlIrtB0WdQL6ToppZVpEU6pES8bu1Ibe3GHezL2pyZMJxw3bNuEYN3sIIz7ZPr2qEHBYEMAbTFyBcoPejvOHJO0I2s0BitBhWEeJB0r5Sb8KGYg3KRnnGIvAQh75AoGBANEC/k1umGrnMO3rwHJF7R+aTHzeMnO6oi11pmSnT7eJcF+oi7OwHS3ickU6sGrIb5QmnwCY9ES1qY6mP7N++KQGsdQM2l13MpCn8cBZgrfpQg2slP1dz8LCDW/PB+6MF7qwEHN2afVA2muQaez+q0eXZjMXmGJ3VZIXz/cxBLD6" +} + +manifest("accessibility_common_guest_manifest") { + input_file = "accessibility_common_manifest.json.jinja2" + output_file = + "$accessibility_out_dir/accessibility_common_guest_manifest.json" + key = "MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC6SX/t6kDEi9UiG4fULwjbEW1uJmQoiJPtxvSZ/SDH14OjSzmfP6xfE97Hus3EY8uSIMxTHkGaZliGbFbIQXQn6/XwBpQRu2gPlrfz7TWR1Hw6SboBBMOpltM9A2nx+d3jLtz+YtKNYVcHyNil9hXfFeyFe6g5kLHapKb1UO0jo3q3kovo1a1z7ujzGwogfLmb58w1hkdFBnnqumRlT55dKLN8AQ6cSdB1sjDVoMgPYeWgkzXr9cR3A8UVJookSO0sDAmD+W8BtBijapt3UVkHiIL1NTPuXvGGUHL7TPFo5WcBXFMkTz74gJqqFdO5hQ2YWXAaCxQJwgJrQPrvPMSJAgMBAAECggEADDhEDww9wWbWzUz3BQEs2In1HrOgAFStN3zEkNFc9B78AJsvpXWczgPUqk9jrg1JzkUeghlK/mDWT8MNkkdQ4kmFMYCM9/jOI6+kU3js+arxlzU84VI5r4c4RhlSOtBEMOHjF0DORP3sopMXOxPAbYjXog3xhA0szYXdedwcIik7Xu3lt1Hl5FfVZbvVLdf4vw0jTfHcp8SmHy/BDVnSCrhC3pnPGi6o+lUaSK0ca3uvcJDZGLXJ/6LyFb6uLlS2XUoBMYsombioRKrerJJSOmMTLHvfu1cM6+iQ+J0wdBnJQpgmDoSVGjnksPU2SMpWgG2OzwuZYIUGI745s19wLQKBgQDvdHsMZ4ttBr9bjydzeZVATWTICHZgXdAYgfgrbGwppYDUjfKoAuJ6bHTvff4nj8aZrY+Y1SwuvqxgHHfiggUgqg+JyeaAdQG+CLdfl1M8An+6H0x/hx0nk0oOJQhu0y1R/SbtnDJ6JASszg/VrTwHIYbzUl6xKHbZ6X41apyLYwKBgQDHKJOeZdxuYj7AsAqFGreuPoAEh0S+2VHHi4rjNz5dC1z7o/8siixfkHg7ONM2hqCKo55XYj4UWtprEFZJ9ohbizHELNzpnTxjdS0cG/VfItml6CDJaUtrkShIx17yGjNi0u/7ywHQ3slJsUXu7CbEcESwEzdoSrsC048dyxBSIwKBgF0141wtxklXcg/LBtldf6q7NbrkCGh0vDd+CEOm/eesRBz5cHbUQKLVKyO60L9HqVBTDm24tW0wzdrP2h7y69oOOOQzEqX4Zgg6Tl9IgZ7/fgbOfjG6P7ATFqWw5rp1O9QJjii6P6/p62P1Bpbvy0kfVO/MpY2iqbkjufxDFtLvAoGBAMC5p4CVGedH82oL8WI1JKLdoIzBSelV7CmqA9E1WIg5wtVRMlIrtB0WdQL6ToppZVpEU6pES8bu1Ibe3GHezL2pyZMJxw3bNuEYN3sIIz7ZPr2qEHBYEMAbTFyBcoPejvOHJO0I2s0BitBhWEeJB0r5Sb8KGYg3KRnnGIvAQh75AoGBANEC/k1umGrnMO3rwHJF7R+aTHzeMnO6oi11pmSnT7eJcF+oi7OwHS3ickU6sGrIb5QmnwCY9ES1qY6mP7N++KQGsdQM2l13MpCn8cBZgrfpQg2slP1dz8LCDW/PB+6MF7qwEHN2afVA2muQaez+q0eXZjMXmGJ3VZIXz/cxBLD6" + is_guest_manifest = true +} + manifest("chromevox_manifest") { input_file = "chromevox_manifest.json.jinja2" output_file = "$accessibility_out_dir/chromevox_manifest.json" @@ -105,7 +121,7 @@ group("browser_tests") { testonly = true if (is_chromeos) { deps = [ - "autoclick:browser_tests", + "accessibility_common:browser_tests", "chromevox:browser_tests", "common:browser_tests", "select_to_speak:browser_tests", diff --git a/chromium/chrome/browser/resources/chromeos/accessibility/accessibility_common/BUILD.gn b/chromium/chrome/browser/resources/chromeos/accessibility/accessibility_common/BUILD.gn new file mode 100644 index 00000000000..9cb8ce6e600 --- /dev/null +++ b/chromium/chrome/browser/resources/chromeos/accessibility/accessibility_common/BUILD.gn @@ -0,0 +1,87 @@ +# 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("//build/config/features.gni") +import( + "//chrome/browser/resources/chromeos/accessibility/common/run_jsbundler.gni") +import("//chrome/test/base/js2gtest.gni") +import("//testing/test.gni") +import("//third_party/closure_compiler/compile_js.gni") + +assert(is_chromeos) + +accessibility_common_dir = + "$root_out_dir/resources/chromeos/accessibility/accessibility_common" + +group("build") { + deps = [ ":accessibility_common_copied_files" ] +} + +# Instead of setting up copy targets, use a script to copy all files. +run_jsbundler("accessibility_common_copied_files") { + mode = "copy" + dest_dir = accessibility_common_dir + sources = [ + "accessibility_common_loader.js", + "autoclick/autoclick.js", + ] + rewrite_rules = [ + rebase_path(".", root_build_dir) + ":", + rebase_path(closure_library_dir, root_build_dir) + ":closure", + ] +} + +source_set("browser_tests") { + testonly = true + assert(enable_extensions) + + deps = [ ":accessibility_common_extjs_tests" ] + + data = [ + "$root_out_dir/chrome_100_percent.pak", + "$root_out_dir/chrome_200_percent.pak", + "$root_out_dir/locales/en-US.pak", + "$root_out_dir/resources.pak", + "$root_out_dir/resources/chromeos/accessibility/accessibility_common/", + "$root_out_dir/test_data/chrome/browser/resources/chromeos/accessibility/accessibility_common/", + + # The test uses data from the original location, not the copied one. + "//chrome/browser/resources/chromeos/accessibility/accessibility_common/", + "//chrome/browser/resources/chromeos/accessibility/common/", + "//ui/webui/resources/js/cr.js", + ] + data += js2gtest_js_libraries +} + +js2gtest("accessibility_common_extjs_tests") { + test_type = "extension" + sources = [ "autoclick_test.js" ] + gen_include_files = [ + "../common/testing/callback_helper.js", + "mock_accessibility_private.js", + ] + + # The test base classes generate C++ code with these deps. + deps = [ + "//ash", + "//ash/keyboard/ui", + "//base", + "//chrome/browser/chromeos", + "//chrome/common", + ] + defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ] +} + +js_type_check("closure_compile") { + deps = [ ":accessibility_common" ] +} + +js_library("accessibility_common") { + deps = [] + externs_list = [ + "$externs_path/accessibility_private.js", + "$externs_path/automation.js", + "$externs_path/accessibility_features.js", + ] +} diff --git a/chromium/chrome/browser/resources/chromeos/accessibility/autoclick/BUILD.gn b/chromium/chrome/browser/resources/chromeos/accessibility/autoclick/BUILD.gn deleted file mode 100644 index f4cc2e8b078..00000000000 --- a/chromium/chrome/browser/resources/chromeos/accessibility/autoclick/BUILD.gn +++ /dev/null @@ -1,123 +0,0 @@ -# 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("//build/config/features.gni") -import( - "//chrome/browser/resources/chromeos/accessibility/chromevox/run_jsbundler.gni") -import("//chrome/test/base/js2gtest.gni") -import("//testing/test.gni") -import("//third_party/closure_compiler/compile_js.gni") - -assert(is_chromeos) - -autoclick_dir = "$root_out_dir/resources/chromeos/accessibility/autoclick" - -group("build") { - deps = [ - ":autoclick_copied_files", - ":autoclick_guest_manifest", - ":autoclick_manifest", - ] -} - -# Instead of setting up copy targets, use a script to copy all files. -run_jsbundler("autoclick_copied_files") { - mode = "copy" - dest_dir = autoclick_dir - sources = [ "autoclick.js" ] - rewrite_rules = [ - rebase_path(".", root_build_dir) + ":", - rebase_path(closure_library_dir, root_build_dir) + ":closure", - ] -} - -# TODO(crbug/978200): refactor this into another file like generate_manifest.gni -# to share with other extensions. -template("manifest") { - version_file = "//chrome/VERSION" - version_script = "//build/util/version.py" - template_file = "manifest.json.jinja2" - output_file = invoker.output_file - key = "MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC6SX/t6kDEi9UiG4fULwjbEW1uJmQoiJPtxvSZ/SDH14OjSzmfP6xfE97Hus3EY8uSIMxTHkGaZliGbFbIQXQn6/XwBpQRu2gPlrfz7TWR1Hw6SboBBMOpltM9A2nx+d3jLtz+YtKNYVcHyNil9hXfFeyFe6g5kLHapKb1UO0jo3q3kovo1a1z7ujzGwogfLmb58w1hkdFBnnqumRlT55dKLN8AQ6cSdB1sjDVoMgPYeWgkzXr9cR3A8UVJookSO0sDAmD+W8BtBijapt3UVkHiIL1NTPuXvGGUHL7TPFo5WcBXFMkTz74gJqqFdO5hQ2YWXAaCxQJwgJrQPrvPMSJAgMBAAECggEADDhEDww9wWbWzUz3BQEs2In1HrOgAFStN3zEkNFc9B78AJsvpXWczgPUqk9jrg1JzkUeghlK/mDWT8MNkkdQ4kmFMYCM9/jOI6+kU3js+arxlzU84VI5r4c4RhlSOtBEMOHjF0DORP3sopMXOxPAbYjXog3xhA0szYXdedwcIik7Xu3lt1Hl5FfVZbvVLdf4vw0jTfHcp8SmHy/BDVnSCrhC3pnPGi6o+lUaSK0ca3uvcJDZGLXJ/6LyFb6uLlS2XUoBMYsombioRKrerJJSOmMTLHvfu1cM6+iQ+J0wdBnJQpgmDoSVGjnksPU2SMpWgG2OzwuZYIUGI745s19wLQKBgQDvdHsMZ4ttBr9bjydzeZVATWTICHZgXdAYgfgrbGwppYDUjfKoAuJ6bHTvff4nj8aZrY+Y1SwuvqxgHHfiggUgqg+JyeaAdQG+CLdfl1M8An+6H0x/hx0nk0oOJQhu0y1R/SbtnDJ6JASszg/VrTwHIYbzUl6xKHbZ6X41apyLYwKBgQDHKJOeZdxuYj7AsAqFGreuPoAEh0S+2VHHi4rjNz5dC1z7o/8siixfkHg7ONM2hqCKo55XYj4UWtprEFZJ9ohbizHELNzpnTxjdS0cG/VfItml6CDJaUtrkShIx17yGjNi0u/7ywHQ3slJsUXu7CbEcESwEzdoSrsC048dyxBSIwKBgF0141wtxklXcg/LBtldf6q7NbrkCGh0vDd+CEOm/eesRBz5cHbUQKLVKyO60L9HqVBTDm24tW0wzdrP2h7y69oOOOQzEqX4Zgg6Tl9IgZ7/fgbOfjG6P7ATFqWw5rp1O9QJjii6P6/p62P1Bpbvy0kfVO/MpY2iqbkjufxDFtLvAoGBAMC5p4CVGedH82oL8WI1JKLdoIzBSelV7CmqA9E1WIg5wtVRMlIrtB0WdQL6ToppZVpEU6pES8bu1Ibe3GHezL2pyZMJxw3bNuEYN3sIIz7ZPr2qEHBYEMAbTFyBcoPejvOHJO0I2s0BitBhWEeJB0r5Sb8KGYg3KRnnGIvAQh75AoGBANEC/k1umGrnMO3rwHJF7R+aTHzeMnO6oi11pmSnT7eJcF+oi7OwHS3ickU6sGrIb5QmnwCY9ES1qY6mP7N++KQGsdQM2l13MpCn8cBZgrfpQg2slP1dz8LCDW/PB+6MF7qwEHN2afVA2muQaez+q0eXZjMXmGJ3VZIXz/cxBLD6" - action(target_name) { - script = "//chrome/browser/resources/chromeos/accessibility/chromevox/tools/generate_manifest.py" - inputs = [ - version_file, - version_script, - ] - sources = [ template_file ] - outputs = [ output_file ] - args = [ - "--key=$key", - "--version_file=" + rebase_path(version_file, root_build_dir), - "--output_manifest=" + rebase_path(output_file, root_build_dir), - ] - if (defined(invoker.is_guest_manifest) && invoker.is_guest_manifest) { - args += [ "--is_guest_manifest=1" ] - } - args += rebase_path(sources, root_build_dir) - } -} - -manifest("autoclick_manifest") { - output_file = "$autoclick_dir/manifest.json" -} - -manifest("autoclick_guest_manifest") { - output_file = "$autoclick_dir/manifest_guest.json" - is_guest_manifest = true -} - -source_set("browser_tests") { - testonly = true - assert(enable_extensions) - - deps = [ ":autoclick_extjs_tests" ] - - data = [ - "$root_out_dir/chrome_100_percent.pak", - "$root_out_dir/chrome_200_percent.pak", - "$root_out_dir/locales/en-US.pak", - "$root_out_dir/resources.pak", - "$root_out_dir/resources/chromeos/accessibility/autoclick/", - "$root_out_dir/test_data/chrome/browser/resources/chromeos/accessibility/autoclick/", - - # The test uses data from the original location, not the copied one. - "//chrome/browser/resources/chromeos/accessibility/autoclick/", - "//chrome/browser/resources/chromeos/accessibility/chromevox/", - "//ui/webui/resources/js/cr.js", - ] - data += js2gtest_js_libraries -} - -js2gtest("autoclick_extjs_tests") { - test_type = "extension" - sources = [ "autoclick_test.js" ] - gen_include_files = [ - "../chromevox/testing/callback_helper.js", - "mock_accessibility_private.js", - ] - - # The test base classes generate C++ code with these deps. - deps = [ - "//ash", - "//ash/keyboard/ui", - "//base", - "//chrome/browser/chromeos", - "//chrome/common", - ] - defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ] -} - -js_type_check("closure_compile") { - deps = [ ":autoclick" ] -} - -js_library("autoclick") { - deps = [] - externs_list = [ - "$externs_path/accessibility_private.js", - "$externs_path/automation.js", - ] -} diff --git a/chromium/chrome/browser/resources/chromeos/accessibility/chromevox/BUILD.gn b/chromium/chrome/browser/resources/chromeos/accessibility/chromevox/BUILD.gn index 7d16612e2df..4b6d105774b 100644 --- a/chromium/chrome/browser/resources/chromeos/accessibility/chromevox/BUILD.gn +++ b/chromium/chrome/browser/resources/chromeos/accessibility/chromevox/BUILD.gn @@ -3,11 +3,15 @@ # found in the LICENSE file. import("//build/config/features.gni") +import( + "//chrome/browser/resources/chromeos/accessibility/common/run_jsbundler.gni") import("//chrome/common/features.gni") import("//chrome/test/base/js2gtest.gni") import("//testing/test.gni") import("//third_party/closure_compiler/compile_js.gni") -import("run_jsbundler.gni") + +# Prevent Chromium source assignment filters from being inherited. +set_sources_assignment_filter([]) declare_args() { # Whether to compress the main Chromevox javascript files or load the @@ -135,12 +139,17 @@ relative_closure_library_modules = [ closure_library_modules = rebase_path(relative_closure_library_modules, ".", closure_library_dir) +chromevox_gen_dir = + "$root_gen_dir/chrome/browser/resources/chromeos/accessibility/chromevox" + chromevox_out_dir = "$root_out_dir/resources/chromeos/accessibility/chromevox" group("build") { deps = [ ":chromevox_copied_files", ":chromevox_phonetic_dictionaries_js", + ":lesson_component", + ":tutorial_component", "//chrome/browser/resources/chromeos/accessibility/braille_ime:braille_ime_manifest", "//third_party/chromevox:chromevox_third_party_resources", "//third_party/liblouis", @@ -182,6 +191,11 @@ run_jsbundler("chromevox_copied_files") { "background/keymaps/default_keymap.json", "background/logging/log.css", "background/logging/log.html", + "i_tutorial/components/i_tutorial.js", + "i_tutorial/components/tutorial_lesson.js", + "i_tutorial/lessons/basic_navigation.html", + "i_tutorial/lessons/jump_commands.html", + "i_tutorial/lessons/text_fields.html", "images/chromevox-128.png", "images/chromevox-16.png", "images/chromevox-19.png", @@ -387,8 +401,8 @@ if (is_chromeos) { "testing/mock_feedback_test.js", ] gen_include_files = [ - "testing/assert_additions.js", - "testing/callback_helper.js", + "../common/testing/assert_additions.js", + "../common/testing/callback_helper.js", "testing/chromevox_unittest_base.js", "testing/mock_feedback.js", ] @@ -426,8 +440,8 @@ if (is_chromeos) { "panel/panel_test.js", ] gen_include_files = [ - "testing/assert_additions.js", - "testing/callback_helper.js", + "../common/testing/assert_additions.js", + "../common/testing/callback_helper.js", "testing/chromevox_e2e_test_base.js", "testing/chromevox_next_e2e_test_base.js", "testing/mock_feedback.js", @@ -443,3 +457,22 @@ if (is_chromeos) { defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ] } } + +copy("lesson_component") { + sources = [ "$chromevox_gen_dir/i_tutorial/components/tutorial_lesson.js" ] + outputs = [ "$chromevox_out_dir/i_tutorial/tutorial_lesson.js" ] + deps = [ + "i_tutorial/components:closure_compile", + "i_tutorial/components:components", + ] +} + +copy("tutorial_component") { + sources = [ "$chromevox_gen_dir/i_tutorial/components/i_tutorial.js" ] + outputs = [ "$chromevox_out_dir/i_tutorial/i_tutorial.js" ] + + deps = [ + "i_tutorial/components:closure_compile", + "i_tutorial/components:components", + ] +} diff --git a/chromium/chrome/browser/resources/chromeos/accessibility/chromevox/i_tutorial/components/BUILD.gn b/chromium/chrome/browser/resources/chromeos/accessibility/chromevox/i_tutorial/components/BUILD.gn new file mode 100644 index 00000000000..679a3871583 --- /dev/null +++ b/chromium/chrome/browser/resources/chromeos/accessibility/chromevox/i_tutorial/components/BUILD.gn @@ -0,0 +1,33 @@ +# Copyright 2020 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/html_to_js.gni") + +html_to_js("components") { + js_files = [ + "tutorial_lesson.js", + "i_tutorial.js", + ] +} + +js_type_check("closure_compile") { + is_polymer3 = true + deps = [ + ":i_tutorial", + ":tutorial_lesson", + ] +} + +js_library("tutorial_lesson") { + deps = [ + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + ] +} + +js_library("i_tutorial") { + deps = [ + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + ] +} diff --git a/chromium/chrome/browser/resources/chromeos/accessibility/common/BUILD.gn b/chromium/chrome/browser/resources/chromeos/accessibility/common/BUILD.gn index 8f6bb71d6e2..af38f4fb21f 100644 --- a/chromium/chrome/browser/resources/chromeos/accessibility/common/BUILD.gn +++ b/chromium/chrome/browser/resources/chromeos/accessibility/common/BUILD.gn @@ -4,7 +4,7 @@ import("//build/config/features.gni") import( - "//chrome/browser/resources/chromeos/accessibility/chromevox/run_jsbundler.gni") + "//chrome/browser/resources/chromeos/accessibility/common/run_jsbundler.gni") import("//chrome/common/features.gni") import("//chrome/test/base/js2gtest.gni") import("//testing/test.gni") @@ -29,6 +29,7 @@ run_jsbundler("accessibility_common_copied_files") { "automation_util.js", "closure_shim.js", "constants.js", + "repeated_event_handler.js", "tree_walker.js", ] rewrite_rules = [ rebase_path(".", root_build_dir) + ":" ] @@ -78,6 +79,10 @@ js_library("automation_util") { ] } +js_library("repeated_event_handler") { + externs_list = [ "$externs_path/automation.js" ] +} + source_set("browser_tests") { testonly = true assert(enable_extensions) @@ -108,15 +113,16 @@ js2gtest("accessibility_tests") { sources = [ "array_util_test.js", "automation_util_test.js", + "repeated_event_handler_test.js", "tree_walker_test.js", ] gen_include_files = [ - "../chromevox/testing/assert_additions.js", - "../chromevox/testing/callback_helper.js", "../chromevox/testing/chromevox_e2e_test_base.js", "../chromevox/testing/chromevox_next_e2e_test_base.js", "../chromevox/testing/mock_feedback.js", "array_util.js", + "testing/assert_additions.js", + "testing/callback_helper.js", ] if (is_chromeos) { diff --git a/chromium/chrome/browser/resources/chromeos/accessibility/chromevox/run_jsbundler.gni b/chromium/chrome/browser/resources/chromeos/accessibility/common/run_jsbundler.gni index c68bb6df6fa..c68bb6df6fa 100644 --- a/chromium/chrome/browser/resources/chromeos/accessibility/chromevox/run_jsbundler.gni +++ b/chromium/chrome/browser/resources/chromeos/accessibility/common/run_jsbundler.gni diff --git a/chromium/chrome/browser/resources/chromeos/accessibility/select_to_speak/BUILD.gn b/chromium/chrome/browser/resources/chromeos/accessibility/select_to_speak/BUILD.gn index e2cf38296ad..63356e98621 100644 --- a/chromium/chrome/browser/resources/chromeos/accessibility/select_to_speak/BUILD.gn +++ b/chromium/chrome/browser/resources/chromeos/accessibility/select_to_speak/BUILD.gn @@ -4,7 +4,7 @@ import("//build/config/features.gni") import( - "//chrome/browser/resources/chromeos/accessibility/chromevox/run_jsbundler.gni") + "//chrome/browser/resources/chromeos/accessibility/common/run_jsbundler.gni") import("//chrome/common/features.gni") import("//chrome/test/base/js2gtest.gni") import("//testing/test.gni") @@ -65,7 +65,7 @@ source_set("browser_tests") { "$root_out_dir/test_data/chrome/browser/resources/chromeos/accessibility/select_to_speak/", # The test uses data from the original location, not the copied one. - "//chrome/browser/resources/chromeos/accessibility/chromevox/", + "//chrome/browser/resources/chromeos/accessibility/common/", "//chrome/browser/resources/chromeos/accessibility/select_to_speak/", "//ui/webui/resources/js/cr.js", ] @@ -80,7 +80,7 @@ js2gtest("select_to_speak_extjs_tests") { "select_to_speak_prefs_test.js", ] gen_include_files = [ - "../chromevox/testing/callback_helper.js", + "../common/testing/callback_helper.js", "mock_storage.js", "mock_tts.js", "select_to_speak_e2e_test_base.js", diff --git a/chromium/chrome/browser/resources/chromeos/accessibility/strings/chromevox_strings.grdp b/chromium/chrome/browser/resources/chromeos/accessibility/strings/chromevox_strings.grdp index 75c816257cb..c7bf4b862b0 100644 --- a/chromium/chrome/browser/resources/chromeos/accessibility/strings/chromevox_strings.grdp +++ b/chromium/chrome/browser/resources/chromeos/accessibility/strings/chromevox_strings.grdp @@ -380,7 +380,10 @@ Show Log </message> <message desc="Keyboard shortcut to show the ChromeVox log." name="IDS_CHROMEVOX_OPTIONS_SHOW_LOG_KEY"> - Search + O + W + Search + O, then W + </message> + <message desc="Keyboard shortcut to show the TTS settings page." name="IDS_CHROMEVOX_OPTIONS_SHOW_TTS_SETTINGS"> + Search + O, then S. Use to install, manage, and customize voices. </message> <message desc="Show event stream filters options for event stream logging." name="IDS_CHROMEVOX_OPTIONS_SHOW_EVENT_STREAM_FILTERS"> Show event stream filters @@ -2975,5 +2978,8 @@ <message desc="Describes a gesture to be performed on a touch screen." name="IDS_CHROMEVOX_CLICK_GESTURE"> Double tap with one finger </message> + <message desc="The text label for the use pitch changes checkbox." name="IDS_CHROMEVOX_OPTIONS_USE_PITCH_CHANGES_CHECKBOX_LABEL"> + Change pitch when speaking element types and quoted, deleted, bolded, parenthesized, or capitalized text. + </message> </grit-part> diff --git a/chromium/chrome/browser/resources/chromeos/accessibility/strings/select_to_speak_strings.grdp b/chromium/chrome/browser/resources/chromeos/accessibility/strings/select_to_speak_strings.grdp index fa31306e16b..58a65969ce8 100644 --- a/chromium/chrome/browser/resources/chromeos/accessibility/strings/select_to_speak_strings.grdp +++ b/chromium/chrome/browser/resources/chromeos/accessibility/strings/select_to_speak_strings.grdp @@ -45,6 +45,9 @@ <message desc="Example of a word highlight on a light background in the Select-to-speak options dialog." name="IDS_SELECT_TO_SPEAK_OPTIONS_HIGHLIGHT_LIGHT"> Light background </message> +<message desc="Label for option to fade the background outside of the focus ring to improve focus on what is being spoken." name="IDS_SELECT_TO_SPEAK_OPTIONS_BACKGROUND_SHADING_DESCRIPTION"> + Shade background content +</message> <message desc="Link to the Text-to-Speech settings page." name="IDS_SELECT_TO_SPEAK_OPTIONS_TEXT_TO_SPEECH_SETTINGS"> Personalize Text-to-Speech settings </message> @@ -72,4 +75,7 @@ <message desc="Description of a radio button that is selected" name="IDS_SELECT_TO_SPEAK_RADIOBUTTON_MIXED"> partially selected </message> +<message desc="Sample text around which will be drawn a Select to Speak visual preview. This should be less than one line long." name="IDS_SELECT_TO_SPEAK_OPTIONS_SAMPLE_TEXT"> + The quick brown fox jumped over the lazy dog. +</message> </grit-part> diff --git a/chromium/chrome/browser/resources/chromeos/accessibility/switch_access/BUILD.gn b/chromium/chrome/browser/resources/chromeos/accessibility/switch_access/BUILD.gn index b930b96e57d..8f75b17ff43 100644 --- a/chromium/chrome/browser/resources/chromeos/accessibility/switch_access/BUILD.gn +++ b/chromium/chrome/browser/resources/chromeos/accessibility/switch_access/BUILD.gn @@ -4,7 +4,7 @@ import("//build/config/features.gni") import( - "//chrome/browser/resources/chromeos/accessibility/chromevox/run_jsbundler.gni") + "//chrome/browser/resources/chromeos/accessibility/common/run_jsbundler.gni") import("//chrome/common/features.gni") import("//chrome/test/base/js2gtest.gni") import("//testing/test.gni") @@ -58,21 +58,20 @@ run_jsbundler("switch_access_copied_files") { "icons/textSelectionEnd.svg", "icons/textSelectionStart.svg", "menu_manager.js", - "menu_panel.css", - "menu_panel.html", - "menu_panel.js", - "menu_panel_interface.js", "metrics.js", "navigation_manager.js", "nodes/back_button_node.js", + "nodes/combo_box_node.js", "nodes/desktop_node.js", "nodes/editable_text_node.js", "nodes/group_node.js", "nodes/keyboard_node.js", + "nodes/modal_dialog_node.js", "nodes/node_wrapper.js", + "nodes/slider_node.js", "nodes/switch_access_node.js", - "nodes/system_menu_node.js", "nodes/tab_node.js", + "nodes/window_node.js", "preferences.js", "rect_helper.js", "switch_access.js", @@ -93,7 +92,7 @@ source_set("browser_tests") { deps = [ ":switch_access_extjs_tests" ] data = [ - "//chrome/browser/resources/chromeos/accessibility/chromevox/", + "//chrome/browser/resources/chromeos/accessibility/common/", "//chrome/browser/resources/chromeos/accessibility/switch_access/", "//ui/webui/resources/js/cr.js", ] @@ -112,7 +111,8 @@ js2gtest("switch_access_extjs_tests") { "text_navigation_manager_test.js", ] gen_include_files = [ - "../chromevox/testing/callback_helper.js", + "../common/testing/assert_additions.js", + "../common/testing/callback_helper.js", "switch_access_e2e_test_base.js", ] @@ -133,6 +133,7 @@ js_type_check("closure_compile") { ":auto_scan_manager", ":back_button_node", ":background", + ":combo_box_node", ":commands", ":desktop_node", ":editable_text_node", @@ -142,22 +143,24 @@ js_type_check("closure_compile") { ":history", ":keyboard_node", ":menu_manager", - ":menu_panel", - ":menu_panel_interface", ":metrics", + ":modal_dialog_node", ":navigation_manager", ":node_wrapper", ":preferences", ":rect_helper", + ":slider_node", ":switch_access", ":switch_access_constants", ":switch_access_node", ":switch_access_predicate", - ":system_menu_node", ":tab_node", ":text_navigation_manager", + ":window_node", + "../common:automation_predicate", "../common:closure_shim", "../common:constants", + "../common:repeated_event_handler", "../common:tree_walker", ] } @@ -184,7 +187,22 @@ js_library("back_button_node") { ] } +js_library("combo_box_node") { + sources = [ "nodes/combo_box_node.js" ] + deps = [ + ":event_helper", + ":node_wrapper", + ":switch_access_constants", + ] + externs_list = [] +} + js_library("commands") { + deps = [ + ":auto_scan_manager", + ":menu_manager", + ":navigation_manager", + ] externs_list = [ "$externs_path/accessibility_private.js" ] } @@ -213,8 +231,8 @@ js_library("event_helper") { js_library("focus_ring_manager") { deps = [ - ":menu_panel_interface", ":node_wrapper", + ":switch_access_constants", ":switch_access_node", ] externs_list = [ "$externs_path/accessibility_private.js" ] @@ -266,54 +284,46 @@ js_library("keyboard_node") { js_library("menu_manager") { deps = [ - ":event_helper", - ":menu_panel_interface", - ":metrics", - ":node_wrapper", - ":rect_helper", ":switch_access_constants", ":switch_access_node", - ":switch_access_predicate", - ":text_navigation_manager", - "../common:constants", - "../common:tree_walker", + "../common:array_util", ] externs_list = [ "$externs_path/accessibility_private.js", "$externs_path/automation.js", - "$externs_path/clipboard.js", ] } -js_library("menu_panel") { - deps = [ - ":menu_manager", - ":switch_access_constants", - ] - externs_list = [ "$externs_path/chrome_extensions.js" ] -} - -js_library("menu_panel_interface") { -} - js_library("metrics") { deps = [ ":switch_access_constants" ] externs_list = [ "$externs_path/metrics_private.js" ] } +js_library("modal_dialog_node") { + sources = [ "nodes/modal_dialog_node.js" ] + deps = [ + ":event_helper", + ":node_wrapper", + ":switch_access_constants", + ":switch_access_node", + ] + externs_list = [ "$externs_path/automation.js" ] +} + js_library("navigation_manager") { deps = [ ":desktop_node", ":focus_ring_manager", + ":history", ":keyboard_node", ":menu_manager", - ":menu_panel_interface", ":metrics", + ":modal_dialog_node", ":node_wrapper", ":switch_access_constants", ":switch_access_node", ":switch_access_predicate", - ":system_menu_node", + "../common:repeated_event_handler", ] externs_list = [ "$externs_path/accessibility_private.js", @@ -328,7 +338,9 @@ js_library("node_wrapper") { ":switch_access_constants", ":switch_access_node", ":switch_access_predicate", + "../common:automation_predicate", "../common:constants", + "../common:repeated_event_handler", "../common:tree_walker", ] externs_list = [ @@ -346,12 +358,21 @@ js_library("rect_helper") { externs_list = [ "$externs_path/accessibility_private.js" ] } +js_library("slider_node") { + sources = [ "nodes/slider_node.js" ] + deps = [ + ":event_helper", + ":node_wrapper", + ":switch_access_constants", + ] + externs_list = [ "$externs_path/automation.js" ] +} + js_library("switch_access") { deps = [ ":auto_scan_manager", ":commands", ":menu_manager", - ":menu_panel_interface", ":navigation_manager", ":preferences", ":switch_access_constants", @@ -362,6 +383,7 @@ js_library("switch_access") { "$externs_path/automation.js", "$externs_path/command_line_private.js", "$externs_path/metrics_private.js", + "$externs_path/virtual_keyboard_private.js", ] } @@ -381,17 +403,7 @@ js_library("switch_access_predicate") { deps = [ ":switch_access_constants", ":switch_access_node", - ] - externs_list = [ "$externs_path/automation.js" ] -} - -js_library("system_menu_node") { - sources = [ "nodes/system_menu_node.js" ] - deps = [ - ":event_helper", - ":node_wrapper", - ":switch_access_constants", - ":switch_access_node", + "../common:automation_predicate", ] externs_list = [ "$externs_path/automation.js" ] } @@ -412,5 +424,16 @@ js_library("text_navigation_manager") { externs_list = [ "$externs_path/accessibility_private.js", "$externs_path/automation.js", + "$externs_path/clipboard.js", ] } + +js_library("window_node") { + sources = [ "nodes/window_node.js" ] + deps = [ + ":node_wrapper", + ":switch_access_constants", + ":switch_access_node", + ] + externs_list = [ "$externs_path/automation.js" ] +} diff --git a/chromium/chrome/browser/resources/chromeos/bluetooth_pairing_dialog/BUILD.gn b/chromium/chrome/browser/resources/chromeos/bluetooth_pairing_dialog/BUILD.gn index e7e7cc85086..f0bd4bdd7bc 100644 --- a/chromium/chrome/browser/resources/chromeos/bluetooth_pairing_dialog/BUILD.gn +++ b/chromium/chrome/browser/resources/chromeos/bluetooth_pairing_dialog/BUILD.gn @@ -2,36 +2,77 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import("//chrome/common/features.gni") import("//third_party/closure_compiler/compile_js.gni") +import("//tools/grit/grit_rule.gni") +import("//tools/polymer/html_to_js.gni") +import("//tools/polymer/polymer.gni") +import("//ui/webui/resources/tools/js_modulizer.gni") import("../../optimize_webui.gni") -optimize_webui("build") { - host = "bluetooth_pairing_dialog" - html_in_files = [ "bluetooth_pairing_dialog.html" ] - html_out_files = [ "vulcanized.html" ] +if (optimize_webui) { + bluetooth_dialog_pak_file = "bluetooth_pairing_dialog_resources.pak" + unpak_folder = "bluetooth_pairing_dialog_resources.unpak" - input = rebase_path(".", root_build_dir) - js_out_files = [ "crisper.js" ] + optimize_webui("build") { + host = "bluetooth-pairing" + js_out_files = [ "bluetooth_pairing_dialog.rollup.js" ] + js_module_in_files = [ "bluetooth_pairing_dialog.js" ] + input = rebase_path("$target_gen_dir/$unpak_folder", root_build_dir) - deps = [] + deps = [ + ":unpak", + "../../../../../ui/webui/resources:modulize", + ] + } + + unpak("unpak") { + pak_file = bluetooth_dialog_pak_file + out_folder = unpak_folder + + deps = [ ":flattened_resources" ] + } + + grit("flattened_resources") { + source = "bluetooth_pairing_dialog_resources.grd" + + deps = [ ":web_components" ] + defines = chrome_grit_defines + grit_flags = [ + "-E", + "root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir), + ] + outputs = [ + "grit/bluetooth_pairing_dialog_resources.h", + "grit/bluetooth_pairing_dialog_resources_map.cc", + "grit/bluetooth_pairing_dialog_resources_map.h", + bluetooth_dialog_pak_file, + ] + output_dir = "$root_gen_dir/chrome/browser/resources/chromeos/bluetooth_pairing_dialog" + } } js_type_check("closure_compile") { + is_polymer3 = true deps = [ ":bluetooth_pairing_dialog" ] } js_library("bluetooth_pairing_dialog") { deps = [ - "//ui/webui/resources/cr_components/chromeos:bluetooth_dialog", - "//ui/webui/resources/js:cr", - "//ui/webui/resources/js:i18n_behavior", - ] - externs_list = [ - "$externs_path/bluetooth.js", - "$externs_path/bluetooth_private.js", + "//ui/webui/resources/cr_components/chromeos/bluetooth:bluetooth_dialog.m", + "//ui/webui/resources/js:cr.m", + "//ui/webui/resources/js:i18n_behavior.m", ] + externs_list = chrome_extension_public_externs + [ + "$externs_path/bluetooth.js", + "$externs_path/bluetooth_private.js", + ] extra_sources = [ "$interfaces_path/bluetooth_interface.js", "$interfaces_path/bluetooth_private_interface.js", ] } + +html_to_js("web_components") { + js_files = [ "bluetooth_pairing_dialog.js" ] +} diff --git a/chromium/chrome/browser/resources/chromeos/bluetooth_pairing_dialog/bluetooth_pairing_dialog_resources.grd b/chromium/chrome/browser/resources/chromeos/bluetooth_pairing_dialog/bluetooth_pairing_dialog_resources.grd new file mode 100644 index 00000000000..c345ebb020f --- /dev/null +++ b/chromium/chrome/browser/resources/chromeos/bluetooth_pairing_dialog/bluetooth_pairing_dialog_resources.grd @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<grit latest_public_release="0" current_release="1" output_all_resource_defines="false"> + <outputs> + <output filename="grit/bluetooth_pairing_dialog_resources.h" type="rc_header"> + <emit emit_type='prepend'></emit> + </output> + <output filename="grit/bluetooth_pairing_dialog_resources_map.cc" + type="resource_file_map_source" /> + <output filename="grit/bluetooth_pairing_dialog_resources_map.h" + type="resource_map_header" /> + <output filename="bluetooth_pairing_dialog_resources.pak" type="data_package" /> + </outputs> + <release seq="1"> + <includes> + <include name="IDR_BLUETOOTH_PAIRING_DIALOG_JS" + file="${root_gen_dir}/chrome/browser/resources/chromeos/bluetooth_pairing_dialog/bluetooth_pairing_dialog.js" + use_base_dir="false" + compress="false" + type="chrome_html" /> + </includes> + <structures> + <structure name="IDR_BLUETOOTH_PAIRING_DIALOG_CONTAINER_HTML" + file="bluetooth_pairing_dialog_container.html" + compress="false" + type="chrome_html" /> + </structures> + </release> +</grit>
\ No newline at end of file diff --git a/chromium/chrome/browser/resources/chromeos/bluetooth_pairing_dialog/bluetooth_pairing_dialog_resources_vulcanized.grd b/chromium/chrome/browser/resources/chromeos/bluetooth_pairing_dialog/bluetooth_pairing_dialog_resources_vulcanized.grd new file mode 100644 index 00000000000..8816618f277 --- /dev/null +++ b/chromium/chrome/browser/resources/chromeos/bluetooth_pairing_dialog/bluetooth_pairing_dialog_resources_vulcanized.grd @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<grit latest_public_release="0" current_release="1" output_all_resource_defines="false"> + <outputs> + <output filename="grit/bluetooth_pairing_dialog_resources.h" type="rc_header"> + <emit emit_type='prepend'></emit> + </output> + <output filename="grit/bluetooth_pairing_dialog_resources_map.cc" + type="resource_map_source" /> + <output filename="grit/bluetooth_pairing_dialog_resources_map.h" + type="resource_map_header" /> + <output filename="bluetooth_pairing_dialog_resources.pak" type="data_package" /> + </outputs> + <release seq="1"> + <includes> + <include name="IDR_BLUETOOTH_PAIRING_DIALOG_CONTAINER_HTML" + file="bluetooth_pairing_dialog_container.html" + type="chrome_html" /> + <include name="IDR_BLUETOOTH_PAIRING_DIALOG_ROLLUP_JS" + file="${root_gen_dir}\chrome\browser\resources\chromeos\bluetooth_pairing_dialog\bluetooth_pairing_dialog.rollup.js" + use_base_dir="false" + preprocess="true" + type="chrome_html" /> + </includes> + </release> +</grit> diff --git a/chromium/chrome/browser/resources/chromeos/camera/BUILD.gn b/chromium/chrome/browser/resources/chromeos/camera/BUILD.gn deleted file mode 100644 index 2c90301b56a..00000000000 --- a/chromium/chrome/browser/resources/chromeos/camera/BUILD.gn +++ /dev/null @@ -1,252 +0,0 @@ -# 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. - -chrome_camera_app_dir = "$root_out_dir/resources/chromeos/camera" - -group("closure_compile") { - deps = [ "src/js:closure_compile" ] -} - -group("chrome_camera_app") { - # According to crbug.com/855747, we should list all the files we want to copy - # rather than list only the folders to avoid potential building issue and ease - # the difficulty to diagnose. - deps = [ - "//chrome/browser/resources/chromeos/camera/src/strings:camera_strings", - ] - - data_deps = [ - ":chrome_camera_app_base", - ":chrome_camera_app_css", - ":chrome_camera_app_images", - ":chrome_camera_app_js", - ":chrome_camera_app_js_browser_proxy", - ":chrome_camera_app_js_device", - ":chrome_camera_app_js_lib", - ":chrome_camera_app_js_models", - ":chrome_camera_app_js_mojo", - ":chrome_camera_app_js_views", - ":chrome_camera_app_js_views_camera", - ":chrome_camera_app_mojo_generated", - ":chrome_camera_app_sounds", - ":chrome_camera_app_views", - ] -} - -copy("chrome_camera_app_base") { - sources = [ "src/manifest.json" ] - - outputs = [ "$chrome_camera_app_dir/{{source_file_part}}" ] -} - -copy("chrome_camera_app_css") { - sources = [ "src/css/main.css" ] - - outputs = [ "$chrome_camera_app_dir/css/{{source_file_part}}" ] -} - -copy("chrome_camera_app_images") { - sources = [ - "src/images/camera_app_icons_128.png", - "src/images/camera_app_icons_48.png", - "src/images/camera_button_fps_30.svg", - "src/images/camera_button_fps_60.svg", - "src/images/camera_button_grid_off.svg", - "src/images/camera_button_grid_on.svg", - "src/images/camera_button_mic_off.svg", - "src/images/camera_button_mic_on.svg", - "src/images/camera_button_mirror_off.svg", - "src/images/camera_button_mirror_on.svg", - "src/images/camera_button_settings.svg", - "src/images/camera_button_switch_device.svg", - "src/images/camera_button_switch_photo.svg", - "src/images/camera_button_switch_video.svg", - "src/images/camera_button_timer_off.svg", - "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_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", - "src/images/camera_mode_video.svg", - "src/images/camera_shutter_photo_start.svg", - "src/images/camera_shutter_photo_start_active.svg", - "src/images/camera_shutter_photo_start_hover.svg", - "src/images/camera_shutter_photo_stop.svg", - "src/images/camera_shutter_photo_stop_hover.svg", - "src/images/settings_button_back.svg", - "src/images/settings_button_expand.svg", - "src/images/settings_feedback.svg", - "src/images/settings_grid_type.svg", - "src/images/settings_help.svg", - "src/images/settings_resolution.svg", - "src/images/settings_timer_duration.svg", - "src/images/spinner.svg", - ] - - outputs = [ "$chrome_camera_app_dir/images/{{source_file_part}}" ] -} - -copy("chrome_camera_app_js") { - sources = [ - "src/js/background.js", - "src/js/background_ops.js", - "src/js/chrome_util.js", - "src/js/error.js", - "src/js/gallerybutton.js", - "src/js/intent.js", - "src/js/main.js", - "src/js/metrics.js", - "src/js/nav.js", - "src/js/perf.js", - "src/js/sound.js", - "src/js/state.js", - "src/js/toast.js", - "src/js/tooltip.js", - "src/js/type.js", - "src/js/util.js", - ] - - outputs = [ "$chrome_camera_app_dir/js/{{source_file_part}}" ] -} - -copy("chrome_camera_app_js_browser_proxy") { - sources = [ - # TODO(b/129956426): Remove dependency used only in closure compiler check. - "src/js/browser_proxy/browser_proxy.js", - "src/js/browser_proxy/browser_proxy_interface.js", - ] - - outputs = [ "$chrome_camera_app_dir/js/browser_proxy/{{source_file_part}}" ] -} - -copy("chrome_camera_app_js_device") { - sources = [ - "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 = [ "$chrome_camera_app_dir/js/device/{{source_file_part}}" ] -} - -copy("chrome_camera_app_js_lib") { - sources = [ - "src/js/lib/analytics.js", - "src/js/lib/comlink.js", - "src/js/lib/ffmpeg.js", - "src/js/lib/ffmpeg.wasm", - ] - - outputs = [ "$chrome_camera_app_dir/js/lib/{{source_file_part}}" ] -} - -copy("chrome_camera_app_js_models") { - sources = [ - "src/js/models/async_writer.js", - "src/js/models/filenamer.js", - "src/js/models/filesystem.js", - "src/js/models/mp4_video_processor.js", - "src/js/models/nop_video_processor.js", - "src/js/models/result_saver.js", - "src/js/models/video_saver.js", - "src/js/models/waitable_event.js", - ] - - outputs = [ "$chrome_camera_app_dir/js/models/{{source_file_part}}" ] -} - -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", - ] - - outputs = [ "$chrome_camera_app_dir/js/mojo/{{source_file_part}}" ] -} - -copy("chrome_camera_app_js_views") { - sources = [ - "src/js/views/camera.js", - "src/js/views/camera_intent.js", - "src/js/views/dialog.js", - "src/js/views/settings.js", - "src/js/views/view.js", - "src/js/views/warning.js", - ] - - outputs = [ "$chrome_camera_app_dir/js/views/{{source_file_part}}" ] -} - -copy("chrome_camera_app_js_views_camera") { - sources = [ - "src/js/views/camera/layout.js", - "src/js/views/camera/modes.js", - "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", - ] - - outputs = [ "$chrome_camera_app_dir/js/views/camera/{{source_file_part}}" ] -} - -copy("chrome_camera_app_sounds") { - sources = [ - "src/sounds/record_end.ogg", - "src/sounds/record_start.ogg", - "src/sounds/shutter.ogg", - "src/sounds/tick_final.ogg", - "src/sounds/tick_inc.ogg", - "src/sounds/tick_start.ogg", - ] - - outputs = [ "$chrome_camera_app_dir/sounds/{{source_file_part}}" ] -} - -copy("chrome_camera_app_views") { - sources = [ - "src/views/background.html", - "src/views/main.html", - ] - - outputs = [ "$chrome_camera_app_dir/views/{{source_file_part}}" ] -} - -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", - "$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/mojo/public/mojom/base/time.mojom-lite.js", - "$root_gen_dir/third_party/blink/public/mojom/idle/idle_manager.mojom-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 = [ - "//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", - "//third_party/blink/public/mojom:mojom_platform_js", - "//ui/gfx/geometry/mojom:mojom_js", - "//ui/gfx/range/mojom:mojom_js", - ] - - outputs = [ "$chrome_camera_app_dir/js/mojo/{{source_file_part}}" ] -} diff --git a/chromium/chrome/browser/resources/chromeos/camera/camera_resources.grd b/chromium/chrome/browser/resources/chromeos/camera/camera_resources.grd deleted file mode 100644 index ab78c3f7507..00000000000 --- a/chromium/chrome/browser/resources/chromeos/camera/camera_resources.grd +++ /dev/null @@ -1,137 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<grit latest_public_release="0" current_release="1" output_all_resource_defines="false"> - <outputs> - <output filename="grit/camera_resources.h" type="rc_header"> - <emit emit_type='prepend'></emit> - </output> - <output filename="grit/camera_resources_map.cc" - type="resource_file_map_source" /> - <output filename="grit/camera_resources_map.h" - type="resource_map_header" /> - <output filename="camera_resources.pak" type="data_package" /> - </outputs> - <release seq="1"> - <structures> - <structure name="IDR_CAMERA_ANALYTICS_JS" file="src/js/lib/analytics.js" type="chrome_html" /> - <structure name="IDR_CAMERA_ASYNC_WRITER_JS" file="src/js/models/async_writer.js" type="chrome_html" /> - <structure name="IDR_CAMERA_BACKGROUND_JS" file="src/js/background.js" type="chrome_html" /> - <structure name="IDR_CAMERA_BACKGROUND_OPS_JS" file="src/js/background_ops.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_INTENT_JS" file="src/js/views/camera_intent.js" type="chrome_html" /> - <structure name="IDR_CAMERA_CAMERA_JS" file="src/js/views/camera.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_CHROME_UTIL_JS" file="src/js/chrome_util.js" type="chrome_html" /> - <structure name="IDR_CAMERA_COMLINK_JS" file="src/js/lib/comlink.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_ERROR_JS" file="src/js/device/error.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_DEVICE_OPERATOR_JS" file="src/js/mojo/device_operator.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/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_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" /> - <structure name="IDR_CAMERA_MAIN_JS" file="src/js/main.js" type="chrome_html" /> - <structure name="IDR_CAMERA_MANIFEST" file="manifest.json" type="chrome_html" /> - <structure name="IDR_CAMERA_METRICS_JS" file="src/js/metrics.js" type="chrome_html" /> - <structure name="IDR_CAMERA_MODES_JS" file="src/js/views/camera/modes.js" type="chrome_html" /> - <structure name="IDR_CAMERA_MP4_VIDEO_PROCESSOR_JS" file="src/js/models/mp4_video_processor.js" type="chrome_html" /> - <structure name="IDR_CAMERA_NAV_JS" file="src/js/nav.js" type="chrome_html" /> - <structure name="IDR_CAMERA_NOP_VIDEO_PROCESSOR_JS" file="src/js/models/nop_video_processor.js" type="chrome_html" /> - <structure name="IDR_CAMERA_OPTIONS_JS" file="src/js/views/camera/options.js" type="chrome_html" /> - <structure name="IDR_CAMERA_PERF_JS" file="src/js/perf.js" type="chrome_html" /> - <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_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_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" /> - <structure name="IDR_CAMERA_STATE_JS" file="src/js/state.js" type="chrome_html" /> - <structure name="IDR_CAMERA_TIMERTICK_JS" file="src/js/views/camera/timertick.js" type="chrome_html" /> - <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_TYPE_JS" file="src/js/type.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_WAITABLE_EVENT_JS" file="src/js/models/waitable_event.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" - type="BINDATA"/> - <include name="IDR_CAMERA_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/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/mojom/camera_metadata_tags.mojom-lite.js" - use_base_dir="false" - type="BINDATA"/> - <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"/> - - <!-- TODO(crbug.com/980846): Add FFMpeg library here with comrpession enabled once video recording is ready to test in SWA --> - - <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_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_SPINNER_SVG" file="src/images/spinner.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_CAMERA_MODE_VIDEO_SVG" file="src/images/camera_mode_video.svg" type="BINDATA" /> - <include name="IDR_CAMERA_CAMERA_SHUTTER_PHOTO_STOP_SVG" file="src/images/camera_shutter_photo_stop.svg" type="BINDATA" /> - <include name="IDR_CAMERA_CAMERA_BUTTON_MIC_OFF_SVG" file="src/images/camera_button_mic_off.svg" type="BINDATA" /> - <include name="IDR_CAMERA_SETTINGS_RESOLUTION_SVG" file="src/images/settings_resolution.svg" type="BINDATA" /> - <include name="IDR_CAMERA_CAMERA_APP_ICONS_48_PNG" file="src/images/camera_app_icons_48.png" type="BINDATA" /> - <include name="IDR_CAMERA_CAMERA_BUTTON_TIMER_OFF_SVG" file="src/images/camera_button_timer_off.svg" type="BINDATA" /> - <include name="IDR_CAMERA_CAMERA_SHUTTER_PHOTO_START_ACTIVE_SVG" file="src/images/camera_shutter_photo_start_active.svg" type="BINDATA" /> - <include name="IDR_CAMERA_CAMERA_APP_ICONS_128_PNG" file="src/images/camera_app_icons_128.png" type="BINDATA" /> - <include name="IDR_CAMERA_CAMERA_APP_ICONS_192_PNG" file="src/images/camera_app_icons_192.png" type="BINDATA" /> - <include name="IDR_CAMERA_SETTINGS_TIMER_DURATION_SVG" file="src/images/settings_timer_duration.svg" type="BINDATA" /> - <include name="IDR_CAMERA_SETTINGS_HELP_SVG" file="src/images/settings_help.svg" type="BINDATA" /> - <include name="IDR_CAMERA_CAMERA_BUTTON_MIRROR_ON_SVG" file="src/images/camera_button_mirror_on.svg" type="BINDATA" /> - <include name="IDR_CAMERA_SETTINGS_BUTTON_EXPAND_SVG" file="src/images/settings_button_expand.svg" type="BINDATA" /> - <include name="IDR_CAMERA_CAMERA_BUTTON_GRID_ON_SVG" file="src/images/camera_button_grid_on.svg" type="BINDATA" /> - <include name="IDR_CAMERA_CAMERA_BUTTON_SWITCH_DEVICE_SVG" file="src/images/camera_button_switch_device.svg" type="BINDATA" /> - <include name="IDR_CAMERA_CAMERA_SHUTTER_PHOTO_STOP_HOVER_SVG" file="src/images/camera_shutter_photo_stop_hover.svg" type="BINDATA" /> - <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_CAMERA_SHUTTER_PHOTO_START_SVG" file="src/images/camera_shutter_photo_start.svg" type="BINDATA" /> - <include name="IDR_CAMERA_CAMERA_BUTTON_SWITCH_PHOTO_SVG" file="src/images/camera_button_switch_photo.svg" type="BINDATA" /> - <include name="IDR_CAMERA_SETTINGS_FEEDBACK_SVG" file="src/images/settings_feedback.svg" type="BINDATA" /> - <include name="IDR_CAMERA_CAMERA_BUTTON_SWITCH_VIDEO_SVG" file="src/images/camera_button_switch_video.svg" type="BINDATA" /> - <include name="IDR_CAMERA_CAMERA_SHUTTER_PHOTO_START_HOVER_SVG" file="src/images/camera_shutter_photo_start_hover.svg" type="BINDATA" /> - <include name="IDR_CAMERA_CAMERA_BUTTON_TIMER_ON_10S_SVG" file="src/images/camera_button_timer_on_10s.svg" type="BINDATA" /> - <include name="IDR_CAMERA_CAMERA_MODE_PHOTO_SVG" file="src/images/camera_mode_photo.svg" type="BINDATA" /> - <include name="IDR_CAMERA_CAMERA_FOCUS_AIM_SVG" file="src/images/camera_focus_aim.svg" type="BINDATA" /> - <include name="IDR_CAMERA_CAMERA_BUTTON_SETTINGS_SVG" file="src/images/camera_button_settings.svg" type="BINDATA" /> - </includes> - </release> -</grit> diff --git a/chromium/chrome/browser/resources/chromeos/camera/src/js/BUILD.gn b/chromium/chrome/browser/resources/chromeos/camera/src/js/BUILD.gn deleted file mode 100644 index 4e76d7e52c3..00000000000 --- a/chromium/chrome/browser/resources/chromeos/camera/src/js/BUILD.gn +++ /dev/null @@ -1,150 +0,0 @@ -# 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", - "browser_proxy:closure_compile", - "device:closure_compile", - "models:closure_compile", - "mojo:closure_compile", - "views:closure_compile", - ] -} - -js_type_check("compile_resources") { - deps = [ - ":background", - ":background_ops", - ":chrome_util", - ":error", - ":gallerybutton", - ":intent", - ":main", - ":metrics", - ":nav", - ":perf", - ":sound", - ":state", - ":toast", - ":tooltip", - ":type", - ":util", - ] -} - -js_library("chrome_util") { -} - -js_library("error") { - deps = [ ":metrics" ] -} - -js_library("intent") { - deps = [ - ":chrome_util", - ":metrics", - ":type", - "mojo:chrome_helper", - ] -} - -js_library("gallerybutton") { - deps = [ - ":chrome_util", - "models:filesystem", - "models:result_saver", - "models:video_saver", - ] - externs_list = [ - "$externs_path/file_manager_private.js", - "$externs_path/file_system_provider.js", - ] -} - -js_library("metrics") { - deps = [ - ":state", - "externs:universal_analytics_api", - ] -} - -js_library("sound") { -} - -js_library("type") { -} - -js_library("main") { - deps = [ - ":background_ops", - ":chrome_util", - ":gallerybutton", - ":intent", - ":state", - ":type", - "device:constraints_preferrer", - "device:device_info_updater", - "views:camera", - "views:camera_intent", - "views:dialog", - "views:settings", - "views:warning", - ] -} - -js_library("nav") { - deps = [ - "mojo:device_operator", - "views:view", - ] -} - -js_library("perf") { -} - -js_library("state") { - deps = [ - ":perf", - ":type", - ] -} - -js_library("background") { - deps = [ - ":background_ops", - ":intent", - ] -} - -js_library("background_ops") { - deps = [ - ":chrome_util", - ":error", - ":intent", - ":perf", - ] -} - -js_library("toast") { - deps = [ ":util" ] -} - -js_library("tooltip") { - deps = [ ":chrome_util" ] -} - -js_library("util") { - deps = [ - ":state", - ":tooltip", - ":type", - "browser_proxy:browser_proxy", - "externs:w3c_api", - "mojo:chrome_helper", - ] - externs_list = [ "$externs_path/chrome_extensions.js" ] -} diff --git a/chromium/chrome/browser/resources/chromeos/camera/src/js/browser_proxy/BUILD.gn b/chromium/chrome/browser/resources/chromeos/camera/src/js/browser_proxy/BUILD.gn deleted file mode 100644 index 909b9b4aea2..00000000000 --- a/chromium/chrome/browser/resources/chromeos/camera/src/js/browser_proxy/BUILD.gn +++ /dev/null @@ -1,28 +0,0 @@ -# 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_type_check("closure_compile") { - deps = [ ":browser_proxy" ] -} - -js_library("browser_proxy") { - deps = [ - "..:chrome_util", - "../mojo:chrome_helper", - ] - sources = [ - "browser_proxy.js", - "browser_proxy_interface.js", - "webui_browser_proxy.js", - ] - externs_list = [ - "../externs/chrome.js", - "$externs_path/chrome_extensions.js", - "$externs_path/file_manager_private.js", - "$externs_path/file_system_provider.js", - "$externs_path/metrics_private.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 deleted file mode 100644 index f4b59b69732..00000000000 --- a/chromium/chrome/browser/resources/chromeos/camera/src/js/device/BUILD.gn +++ /dev/null @@ -1,44 +0,0 @@ -# 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_type_check("closure_compile") { - deps = [ - ":camera3_device_info", - ":constraints_preferrer", - ":device_info_updater", - ":error", - ] -} - -js_library("camera3_device_info") { - deps = [ - "..:type", - "../mojo:image_capture", - ] -} - -js_library("constraints_preferrer") { - deps = [ - ":camera3_device_info", - "..:chrome_util", - "..:state", - "..:type", - "../browser_proxy:browser_proxy", - ] -} - -js_library("device_info_updater") { - deps = [ - ":camera3_device_info", - ":constraints_preferrer", - ":error", - "..:state", - "..:type", - ] -} - -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 deleted file mode 100644 index cae1c53cb2d..00000000000 --- a/chromium/chrome/browser/resources/chromeos/camera/src/js/externs/BUILD.gn +++ /dev/null @@ -1,17 +0,0 @@ -# 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("universal_analytics_api") { - sources = [] - - externs_list = [ "universal_analytics_api.js" ] -} - -js_library("w3c_api") { - sources = [] - - externs_list = [ "w3c_api.js" ] -} diff --git a/chromium/chrome/browser/resources/chromeos/camera/src/js/lib/BUILD.gn b/chromium/chrome/browser/resources/chromeos/camera/src/js/lib/BUILD.gn deleted file mode 100644 index 67207741560..00000000000 --- a/chromium/chrome/browser/resources/chromeos/camera/src/js/lib/BUILD.gn +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2020 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("comlink") { - sources = [ "comlink.js" ] -} - -js_library("ffmpeg") { - sources = [ "ffmpeg.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 deleted file mode 100644 index e2c787dd54f..00000000000 --- a/chromium/chrome/browser/resources/chromeos/camera/src/js/models/BUILD.gn +++ /dev/null @@ -1,43 +0,0 @@ -# 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_type_check("closure_compile") { - deps = [ - ":filenamer", - ":filesystem", - ":result_saver", - ":video_saver", - ] -} - -js_library("filenamer") { -} - -js_library("filesystem") { - deps = [ - ":filenamer", - "../browser_proxy:browser_proxy", - ] -} - -js_library("result_saver") { -} - -js_library("video_saver") { - sources = [ - "async_writer.js", - "mp4_video_processor.js", - "nop_video_processor.js", - "video_saver.js", - "waitable_event.js", - ] - deps = [ - "..:intent", - "../externs:w3c_api", - "../lib:comlink", - "../lib:ffmpeg", - ] -} 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 deleted file mode 100644 index b1bdcd32ae1..00000000000 --- a/chromium/chrome/browser/resources/chromeos/camera/src/js/mojo/BUILD.gn +++ /dev/null @@ -1,39 +0,0 @@ -# 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_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", - "//third_party/blink/public/mojom:mojom_platform_js_library_for_compile", - ] - externs_list = [ "$externs_path/pending.js" ] -} - -js_library("device_operator") { - deps = [ - "..:type", - "//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", - ] - 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 deleted file mode 100644 index 6cfbb72e337..00000000000 --- a/chromium/chrome/browser/resources/chromeos/camera/src/js/views/BUILD.gn +++ /dev/null @@ -1,67 +0,0 @@ -# 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", - "camera:compile_resources", - ] -} - -js_type_check("compile_resources") { - deps = [ - ":camera", - ":camera_intent", - ":dialog", - ":settings", - ":view", - ":warning", - ] -} - -js_library("camera") { - deps = [ - "..:background_ops", - "..:chrome_util", - "..:metrics", - "..:type", - "../models:result_saver", - "camera:layout", - "camera:modes", - "camera:options", - "camera:preview", - "camera:timertick", - ] -} - -js_library("dialog") { -} - -js_library("camera_intent") { - deps = [ - ":camera", - "..:chrome_util", - "../models:video_saver", - "camera:review_result", - ] -} - -js_library("settings") { - deps = [ - ":view", - "..:nav", - "..:type", - "../device:camera3_device_info", - "../device:device_info_updater", - ] -} - -js_library("view") { - deps = [ "..:toast" ] -} - -js_library("warning") { -} 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 deleted file mode 100644 index 97fdd2dce89..00000000000 --- a/chromium/chrome/browser/resources/chromeos/camera/src/js/views/camera/BUILD.gn +++ /dev/null @@ -1,77 +0,0 @@ -# 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 = [ - ":layout", - ":modes", - ":options", - ":preview", - ":recordtime", - ":review_result", - ":timertick", - "../../mojo:device_operator", - ] -} - -js_library("layout") { - deps = [ - "../..:chrome_util", - "../..:type", - ] -} - -js_library("modes") { - deps = [ - ":recordtime", - "../..:sound", - "../..:toast", - "../..:type", - "../..:util", - "../../device:constraints_preferrer", - "../../models:filenamer", - "../../models:filesystem", - "../../models:video_saver", - "../../mojo:image_capture", - "//media/capture/video/chromeos/mojom:cros_camera_js_library_for_compile", - ] -} - -js_library("options") { - deps = [ - "../..:nav", - "../..:type", - "../..:util", - "../../device:device_info_updater", - "//components/chromeos_camera/common:camera_app_helper_js_library_for_compile", - ] -} - -js_library("preview") { - deps = [ - "../..:chrome_util", - "../..:nav", - "../..:type", - "//media/capture/video/chromeos/mojom:cros_camera_js_library_for_compile", - ] -} - -js_library("recordtime") { -} - -js_library("review_result") { - deps = [ - "../..:state", - "../..:util", - ] -} - -js_library("timertick") { -} diff --git a/chromium/chrome/browser/resources/chromeos/camera/src/strings/BUILD.gn b/chromium/chrome/browser/resources/chromeos/camera/src/strings/BUILD.gn deleted file mode 100644 index 6535e9e8673..00000000000 --- a/chromium/chrome/browser/resources/chromeos/camera/src/strings/BUILD.gn +++ /dev/null @@ -1,71 +0,0 @@ -# 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("//chrome/common/features.gni") -import("//tools/grit/grit_rule.gni") - -chrome_camera_app_dir = "$root_out_dir/resources/chromeos/camera" - -grit("camera_strings") { - source = "camera_strings.grd" - defines = chrome_grit_defines - outputs = [ - "_locales/am/messages.json", - "_locales/ar/messages.json", - "_locales/bg/messages.json", - "_locales/bn/messages.json", - "_locales/ca/messages.json", - "_locales/cs/messages.json", - "_locales/da/messages.json", - "_locales/de/messages.json", - "_locales/el/messages.json", - "_locales/en_GB/messages.json", - "_locales/en/messages.json", - "_locales/es/messages.json", - "_locales/es_419/messages.json", - "_locales/et/messages.json", - "_locales/fa/messages.json", - "_locales/fi/messages.json", - "_locales/fil/messages.json", - "_locales/fr/messages.json", - "_locales/gu/messages.json", - "_locales/he/messages.json", - "_locales/hi/messages.json", - "_locales/hr/messages.json", - "_locales/hu/messages.json", - "_locales/id/messages.json", - "_locales/it/messages.json", - "_locales/ja/messages.json", - "_locales/kn/messages.json", - "_locales/ko/messages.json", - "_locales/lt/messages.json", - "_locales/lv/messages.json", - "_locales/ml/messages.json", - "_locales/mr/messages.json", - "_locales/ms/messages.json", - "_locales/nl/messages.json", - "_locales/nb/messages.json", - "_locales/pl/messages.json", - "_locales/pt_BR/messages.json", - "_locales/pt_PT/messages.json", - "_locales/ro/messages.json", - "_locales/ru/messages.json", - "_locales/sk/messages.json", - "_locales/sl/messages.json", - "_locales/sr/messages.json", - "_locales/sv/messages.json", - "_locales/sw/messages.json", - "_locales/ta/messages.json", - "_locales/te/messages.json", - "_locales/th/messages.json", - "_locales/tr/messages.json", - "_locales/uk/messages.json", - "_locales/vi/messages.json", - "_locales/zh_CN/messages.json", - "_locales/zh_TW/messages.json", - ] - output_dir = chrome_camera_app_dir - - resource_ids = "" -} 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 deleted file mode 100644 index f22c312b325..00000000000 --- a/chromium/chrome/browser/resources/chromeos/camera/src/strings/camera_strings.grd +++ /dev/null @@ -1,366 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<grit base_dir="." current_release="1" latest_public_release="0" - output_all_resource_defines="false" enc_check="möl" source_lang_id="en"> - <outputs> - <output filename="_locales/am/messages.json" type="chrome_messages_json" lang="am"/> - <output filename="_locales/ar/messages.json" type="chrome_messages_json" lang="ar"/> - <output filename="_locales/bg/messages.json" type="chrome_messages_json" lang="bg"/> - <output filename="_locales/bn/messages.json" type="chrome_messages_json" lang="bn"/> - <output filename="_locales/ca/messages.json" type="chrome_messages_json" lang="ca"/> - <output filename="_locales/cs/messages.json" type="chrome_messages_json" lang="cs"/> - <output filename="_locales/da/messages.json" type="chrome_messages_json" lang="da"/> - <output filename="_locales/de/messages.json" type="chrome_messages_json" lang="de"/> - <output filename="_locales/el/messages.json" type="chrome_messages_json" lang="el"/> - <output filename="_locales/en_GB/messages.json" type="chrome_messages_json" lang="en-GB"/> - <output filename="_locales/en/messages.json" type="chrome_messages_json" lang="en"/> - <output filename="_locales/es/messages.json" type="chrome_messages_json" lang="es"/> - <output filename="_locales/es_419/messages.json" type="chrome_messages_json" lang="es-419"/> - <output filename="_locales/et/messages.json" type="chrome_messages_json" lang="et"/> - <output filename="_locales/fa/messages.json" type="chrome_messages_json" lang="fa"/> - <output filename="_locales/fi/messages.json" type="chrome_messages_json" lang="fi"/> - <output filename="_locales/fil/messages.json" type="chrome_messages_json" lang="fil"/> - <output filename="_locales/fr/messages.json" type="chrome_messages_json" lang="fr"/> - <output filename="_locales/gu/messages.json" type="chrome_messages_json" lang="gu"/> - <output filename="_locales/he/messages.json" type="chrome_messages_json" lang="he"/> - <output filename="_locales/hi/messages.json" type="chrome_messages_json" lang="hi"/> - <output filename="_locales/hr/messages.json" type="chrome_messages_json" lang="hr"/> - <output filename="_locales/hu/messages.json" type="chrome_messages_json" lang="hu"/> - <output filename="_locales/id/messages.json" type="chrome_messages_json" lang="id"/> - <output filename="_locales/it/messages.json" type="chrome_messages_json" lang="it"/> - <output filename="_locales/ja/messages.json" type="chrome_messages_json" lang="ja"/> - <output filename="_locales/kn/messages.json" type="chrome_messages_json" lang="kn"/> - <output filename="_locales/ko/messages.json" type="chrome_messages_json" lang="ko"/> - <output filename="_locales/lt/messages.json" type="chrome_messages_json" lang="lt"/> - <output filename="_locales/lv/messages.json" type="chrome_messages_json" lang="lv"/> - <output filename="_locales/ml/messages.json" type="chrome_messages_json" lang="ml"/> - <output filename="_locales/mr/messages.json" type="chrome_messages_json" lang="mr"/> - <output filename="_locales/ms/messages.json" type="chrome_messages_json" lang="ms"/> - <output filename="_locales/nl/messages.json" type="chrome_messages_json" lang="nl"/> - <output filename="_locales/nb/messages.json" type="chrome_messages_json" lang="no"/> - <output filename="_locales/pl/messages.json" type="chrome_messages_json" lang="pl"/> - <output filename="_locales/pt_BR/messages.json" type="chrome_messages_json" lang="pt-BR"/> - <output filename="_locales/pt_PT/messages.json" type="chrome_messages_json" lang="pt-PT"/> - <output filename="_locales/ro/messages.json" type="chrome_messages_json" lang="ro"/> - <output filename="_locales/ru/messages.json" type="chrome_messages_json" lang="ru"/> - <output filename="_locales/sk/messages.json" type="chrome_messages_json" lang="sk"/> - <output filename="_locales/sl/messages.json" type="chrome_messages_json" lang="sl"/> - <output filename="_locales/sr/messages.json" type="chrome_messages_json" lang="sr"/> - <output filename="_locales/sv/messages.json" type="chrome_messages_json" lang="sv"/> - <output filename="_locales/sw/messages.json" type="chrome_messages_json" lang="sw"/> - <output filename="_locales/ta/messages.json" type="chrome_messages_json" lang="ta"/> - <output filename="_locales/te/messages.json" type="chrome_messages_json" lang="te"/> - <output filename="_locales/th/messages.json" type="chrome_messages_json" lang="th"/> - <output filename="_locales/tr/messages.json" type="chrome_messages_json" lang="tr"/> - <output filename="_locales/uk/messages.json" type="chrome_messages_json" lang="uk"/> - <output filename="_locales/vi/messages.json" type="chrome_messages_json" lang="vi"/> - <output filename="_locales/zh_CN/messages.json" type="chrome_messages_json" lang="zh-CN"/> - <output filename="_locales/zh_TW/messages.json" type="chrome_messages_json" lang="zh-TW"/> - </outputs> - <translations> - <file path="camera_strings_af.xtb" lang="af" /> - <file path="camera_strings_am.xtb" lang="am" /> - <file path="camera_strings_ar.xtb" lang="ar" /> - <file path="camera_strings_as.xtb" lang="as" /> - <file path="camera_strings_az.xtb" lang="az" /> - <file path="camera_strings_be.xtb" lang="be" /> - <file path="camera_strings_bg.xtb" lang="bg" /> - <file path="camera_strings_bn.xtb" lang="bn" /> - <file path="camera_strings_bs.xtb" lang="bs" /> - <file path="camera_strings_ca.xtb" lang="ca" /> - <file path="camera_strings_cs.xtb" lang="cs" /> - <file path="camera_strings_da.xtb" lang="da" /> - <file path="camera_strings_de.xtb" lang="de" /> - <file path="camera_strings_el.xtb" lang="el" /> - <file path="camera_strings_en-GB.xtb" lang="en-GB" /> - <file path="camera_strings_es.xtb" lang="es" /> - <file path="camera_strings_es-419.xtb" lang="es-419" /> - <file path="camera_strings_et.xtb" lang="et" /> - <file path="camera_strings_eu.xtb" lang="eu" /> - <file path="camera_strings_fa.xtb" lang="fa" /> - <file path="camera_strings_fi.xtb" lang="fi" /> - <file path="camera_strings_fil.xtb" lang="fil" /> - <file path="camera_strings_fr.xtb" lang="fr" /> - <file path="camera_strings_fr-CA.xtb" lang="fr-CA" /> - <file path="camera_strings_gl.xtb" lang="gl" /> - <file path="camera_strings_gu.xtb" lang="gu" /> - <file path="camera_strings_hi.xtb" lang="hi" /> - <file path="camera_strings_hr.xtb" lang="hr" /> - <file path="camera_strings_hu.xtb" lang="hu" /> - <file path="camera_strings_hy.xtb" lang="hy" /> - <file path="camera_strings_id.xtb" lang="id" /> - <file path="camera_strings_is.xtb" lang="is" /> - <file path="camera_strings_it.xtb" lang="it" /> - <!-- The translation console uses 'iw' for Hebrew, but we use 'he'. --> - <file path="camera_strings_iw.xtb" lang="he" /> - <file path="camera_strings_ja.xtb" lang="ja" /> - <file path="camera_strings_ka.xtb" lang="ka" /> - <file path="camera_strings_kk.xtb" lang="kk" /> - <file path="camera_strings_km.xtb" lang="km" /> - <file path="camera_strings_kn.xtb" lang="kn" /> - <file path="camera_strings_ko.xtb" lang="ko" /> - <file path="camera_strings_ky.xtb" lang="ky" /> - <file path="camera_strings_lo.xtb" lang="lo" /> - <file path="camera_strings_lt.xtb" lang="lt" /> - <file path="camera_strings_lv.xtb" lang="lv" /> - <file path="camera_strings_mk.xtb" lang="mk" /> - <file path="camera_strings_ml.xtb" lang="ml" /> - <file path="camera_strings_mn.xtb" lang="mn" /> - <file path="camera_strings_mr.xtb" lang="mr" /> - <file path="camera_strings_ms.xtb" lang="ms" /> - <file path="camera_strings_my.xtb" lang="my" /> - <file path="camera_strings_ne.xtb" lang="ne" /> - <file path="camera_strings_nl.xtb" lang="nl" /> - <file path="camera_strings_no.xtb" lang="no" /> - <file path="camera_strings_or.xtb" lang="or" /> - <file path="camera_strings_pa.xtb" lang="pa" /> - <file path="camera_strings_pl.xtb" lang="pl" /> - <file path="camera_strings_pt-BR.xtb" lang="pt-BR" /> - <file path="camera_strings_pt-PT.xtb" lang="pt-PT" /> - <file path="camera_strings_ro.xtb" lang="ro" /> - <file path="camera_strings_ru.xtb" lang="ru" /> - <file path="camera_strings_si.xtb" lang="si" /> - <file path="camera_strings_sk.xtb" lang="sk" /> - <file path="camera_strings_sl.xtb" lang="sl" /> - <file path="camera_strings_sq.xtb" lang="sq" /> - <file path="camera_strings_sr.xtb" lang="sr" /> - <file path="camera_strings_sr-Latn.xtb" lang="sr-Latn" /> - <file path="camera_strings_sv.xtb" lang="sv" /> - <file path="camera_strings_sw.xtb" lang="sw" /> - <file path="camera_strings_ta.xtb" lang="ta" /> - <file path="camera_strings_te.xtb" lang="te" /> - <file path="camera_strings_th.xtb" lang="th" /> - <file path="camera_strings_tr.xtb" lang="tr" /> - <file path="camera_strings_uk.xtb" lang="uk" /> - <file path="camera_strings_ur.xtb" lang="ur" /> - <file path="camera_strings_uz.xtb" lang="uz" /> - <file path="camera_strings_vi.xtb" lang="vi" /> - <file path="camera_strings_zh-CN.xtb" lang="zh-CN" /> - <file path="camera_strings_zh-HK.xtb" lang="zh-HK" /> - <file path="camera_strings_zh-TW.xtb" lang="zh-TW" /> - <file path="camera_strings_zu.xtb" lang="zu" /> - </translations> - <release allow_pseudo="false" seq="1"> - <messages fallback_to_english="true"> - <message desc="Label for timer-duration: 10 seconds." name="IDS_LABEL_TIMER_10S"> - 10 seconds - </message> - <message desc="Label for the help button." name="IDS_HELP_BUTTON"> - Help - </message> - <message desc="Label for the dismissing button in the dialog." name="IDS_DIALOG_CANCEL_BUTTON"> - Cancel - </message> - <message desc="Label for the printing button." name="IDS_PRINT_BUTTON"> - Print - </message> - <message desc="Label for the gallery button." name="IDS_GALLERY_BUTTON"> - Go to gallery - </message> - <message desc="Error message shown when saving/adding a image or video to the file system failed." name="IDS_ERROR_MSG_SAVE_FILE_FAILED"> - Unable to save the file - </message> - <message desc="Label for the exporting button." name="IDS_EXPORT_BUTTON"> - Export to disk - </message> - <message desc="Label for the checkbox to toggle the countdown timer." name="IDS_TOGGLE_TIMER_BUTTON"> - Timer - </message> - <message desc="Message shown before moving all photos and videos stored in the Camera App to the Downloads folder." name="IDS_MIGRATE_PICTURES_MSG"> - Photos and videos taken with the camera will be moved to the Downloads folder. You can access them in Files. - - Apps with storage permissions will have access to your photos and videos. - </message> - <message desc="Label for spoken feedback to read out grid-type: 3x3." name="IDS_ARIA_GRID_3X3"> - 3 by 3 - </message> - <message desc="Label for the shutter button to start recording." name="IDS_RECORD_VIDEO_START_BUTTON"> - Start recording - </message> - <message desc="Label for the shutter button to stop recording." name="IDS_RECORD_VIDEO_STOP_BUTTON"> - Stop recording - </message> - <message desc="Label for the button to switch to next connected camera. Eg. switching from front facing to back facing, or a camera connected via USB. The button is shown only when more than one camera is connected." name="IDS_SWITCH_CAMERA_BUTTON"> - Switch to next camera - </message> - <message desc="Label for the button of timer-duration options." name="IDS_TIMER_DURATION_BUTTON"> - Timer duration - </message> - <message desc="Label for timer-duration: 3 seconds." name="IDS_LABEL_TIMER_3S"> - 3 seconds - </message> - <message desc="Status message for spoken feedback when video recording has been stopped." name="IDS_STATUS_MSG_RECORDING_STOPPED"> - Recording stopped - </message> - <message desc="Label for spoken feedback to read out grid-type: 4x4." name="IDS_ARIA_GRID_4X4"> - 4 by 4 - </message> - <message desc="Label for for grid-type: 4x4." name="IDS_LABEL_GRID_4X4"> - 4 x 4 - </message> - <message desc="Label for the button of camera-resolution options." name="IDS_CAMERA_RESOLUTION_BUTTON"> - Camera resolution - </message> - <message desc="Label for the button of photo-resolution options." name="IDS_PHOTO_RESOLUTION_BUTTON"> - Photo resolution - </message> - <message desc="Label for the button of video-resolution options." name="IDS_VIDEO_RESOLUTION_BUTTON"> - Video resolution - </message> - <message desc="Label for front camera." name="IDS_LABEL_FRONT_CAMERA"> - Front camera - </message> - <message desc="Label for back camera." name="IDS_LABEL_BACK_CAMERA"> - Back camera - </message> - <message desc="Label for external camera." name="IDS_LABEL_EXTERNAL_CAMERA"> - External camera - </message> - <message desc="Label for photo resolution options of specific resolution." name="IDS_LABEL_PHOTO_RESOLUTION"> - (<ph name="aspect_ratio_width">$1<ex>16</ex></ph>:<ph name="aspect_ratio_height">$2<ex>9</ex></ph>) <ph name="megapixel">$3<ex>0.9</ex></ph> mega pixel - </message> - <message desc="Label for detail photo resolution options of specific resolution." name="IDS_LABEL_DETAIL_PHOTO_RESOLUTION"> - (<ph name="aspect_ratio_width">$1<ex>16</ex></ph>:<ph name="aspect_ratio_height">$2<ex>9</ex></ph> - <ph name="width">$3<ex>1920</ex></ph>x<ph name="height">$4<ex>1080</ex></ph>) <ph name="megapixel">$5<ex>0.9</ex></ph> mega pixel - </message> - <message desc="Label for video resolution options of specific resolution." name="IDS_LABEL_VIDEO_RESOLUTION"> - HD <ph name="height">$1<ex>720</ex></ph>p (<ph name="width">$2<ex>1280</ex></ph>:<ph name="height">$1<ex>720</ex></ph>) - </message> - <message desc="Confirmation message before removing a selected item from the gallery. Expects a file name to be passed in." name="IDS_DELETE_CONFIRMATION_MSG"> - Do you really want to remove <ph name="file">$1<ex>IMG_20160520_000000.jpg</ex></ph>? - </message> - <message desc="Label for spoken feedback to read out switch to take photo mode button." name="IDS_SWITCH_TAKE_PHOTO_BUTTON"> - Switch to take photo - </message> - <message desc="Label for switch to take photo mode button." name="IDS_LABEL_SWITCH_TAKE_PHOTO_BUTTON"> - Photo - </message> - <message desc="Label for the checkbox to toggle the grid shown on preview." name="IDS_TOGGLE_GRID_BUTTON"> - Grid - </message> - <message desc="Label for the shutter button to take photo." name="IDS_TAKE_PHOTO_BUTTON"> - Take photo - </message> - <message desc="Error message shown when it was impossible to connect to the camera due to unavailability." name="IDS_ERROR_MSG_NO_CAMERA"> - Your camera is currently unavailable. - Please check if the camera is properly connected. - </message> - <message desc="Error message shown when failing to start recording video." name="IDS_ERROR_MSG_RECORD_START_FAILED"> - Unable to start recording - </message> - <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="Label for expert mode option: print performance logs." name="IDS_EXPERT_PRINT_PERFORMANCE_LOGS"> - Print performance logs - </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> - <message desc="Error message shown when failing to take photo." name="IDS_ERROR_MSG_TAKE_PHOTO_FAILED"> - Unable to take photo - </message> - <message desc="Error message shown when failing to take portrait photo." name="IDS_ERROR_MSG_TAKE_PORTRAIT_PHOTO_FAILED"> - Unable to take portrait photo - </message> - <message desc="Short description of the Camera App." name="IDS_DESCRIPTION"> - Take photos and record videos with your camera. - </message> - <message desc="Label for for grid-type: 3x3." name="IDS_LABEL_GRID_3X3"> - 3 x 3 - </message> - <message desc="Label for the shutter button to cancel countdown timer and stop taking photo." name="IDS_TAKE_PHOTO_CANCEL_BUTTON"> - Stop taking photo - </message> - <message desc="Label for the delete button." name="IDS_DELETE_BUTTON"> - Delete - </message> - <message desc="Error message shown when no data is recorded for a recording and it won't be added to the gallery." name="IDS_ERROR_MSG_EMPTY_RECORDING"> - Nothing recorded - </message> - <message desc="Confirmation message before removing multiple selected items from the gallery. Expects a file count to be passed in." name="IDS_DELETE_MULTI_CONFIRMATION_MSG"> - Do you really want to remove <ph name="count">$1<ex>20</ex></ph> items? - </message> - <message desc="Text to speech label for the gallery list." name="IDS_GALLERY_IMAGES"> - Gallery images - </message> - <message desc="Error message shown when exporting to an external directory failed. Expects a file name to be passed in." name="IDS_ERROR_MSG_GALLERY_EXPORT_FAILED"> - Unable to export <ph name="file">$1<ex>IMG_20160520_000000.jpg</ex></ph> - </message> - <message desc="Status message for spoken feedback when switching over to another camera." name="IDS_STATUS_MSG_CAMERA_SWITCHED"> - <ph name="camera">$1<ex>USB WebCam (12ab:5678) User-facing</ex></ph> active - </message> - <message desc="Name of the Camera App." name="IDS_NAME"> - Camera - </message> - <message desc="Error message shown when failing to read or write the file system." name="IDS_ERROR_MSG_FILE_SYSTEM_FAILED"> - File system errors. - </message> - <message desc="Label for the settings button." name="IDS_SETTINGS_BUTTON"> - Settings - </message> - <message desc="Label for the accepting button in the dialog." name="IDS_DIALOG_OK_BUTTON"> - OK - </message> - <message desc="Label for grid-type: golden ratio." name="IDS_LABEL_GRID_GOLDEN"> - Golden ratio - </message> - <message desc="Label for spoken feedback to read out switch to record video mode button." name="IDS_SWITCH_RECORD_VIDEO_BUTTON"> - Switch to record video - </message> - <message desc="Label for switch to record video mode button." name="IDS_LABEL_SWITCH_RECORD_VIDEO_BUTTON"> - Video - </message> - <message desc="Label for the checkbox to toggle the preview mirroring. Eg. if mirroring is toggled on, preview will be flipped horizontally." name="IDS_TOGGLE_MIRROR_BUTTON"> - Mirroring - </message> - <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> - <message desc="Label for the back button." name="IDS_BACK_BUTTON"> - Go back - </message> - <message desc="Label for spoken feedback to read out switch to take square photo mode button." name="IDS_SWITCH_TAKE_SQUARE_PHOTO_BUTTON"> - Switch to take square photo - </message> - <message desc="Label for switch to take square photo mode button." name="IDS_LABEL_SWITCH_TAKE_SQUARE_PHOTO_BUTTON"> - Square - </message> - <message desc="Label for spoken feedback to read out switch to take portrait photo mode button." name="IDS_SWITCH_TAKE_PORTRAIT_PHOTO_BUTTON"> - Switch to take portrait photo - </message> - <message desc="Label for switch to take portrait photo mode button." name="IDS_LABEL_SWITCH_TAKE_PORTRAIT_PHOTO_BUTTON"> - Portrait - </message> - <message desc="Label for the confirm button to confirm with the reviewed photo or video." name="IDS_CONFIRM_REVIEW_BUTTON"> - Confirm - </message> - <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 the button to play video." name="IDS_PLAY_RESULT_VIDEO_BUTTON"> - Play video - </message> - </messages> - </release> -</grit> 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 f899962417a..af80c45ce88 100644 --- a/chromium/chrome/browser/resources/chromeos/internet_config_dialog/BUILD.gn +++ b/chromium/chrome/browser/resources/chromeos/internet_config_dialog/BUILD.gn @@ -29,9 +29,9 @@ js_library("internet_config_dialog") { "//ui/webui/resources/js:assert", "//ui/webui/resources/js:i18n_behavior", ] - externs_list = [ - "$externs_path/chrome_send.js", - "$externs_path/networking_private.js", - ] + externs_list = chrome_extension_public_externs + [ + "$externs_path/chrome_send.js", + "$externs_path/networking_private.js", + ] extra_sources = [ "$interfaces_path/networking_private_interface.js" ] } diff --git a/chromium/chrome/browser/resources/chromeos/login/BUILD.gn b/chromium/chrome/browser/resources/chromeos/login/BUILD.gn index c453524aa61..6e02f0073a2 100644 --- a/chromium/chrome/browser/resources/chromeos/login/BUILD.gn +++ b/chromium/chrome/browser/resources/chromeos/login/BUILD.gn @@ -17,7 +17,6 @@ js_type_check("closure_compile") { ":gaia_buttons", ":gaia_card", ":gaia_header", - ":gaia_input", ":gaia_input_form", ":gaia_password_changed", ":gesture_navigation", @@ -141,11 +140,13 @@ js_library("gaia_header") { js_library("gaia_input_form") { } -js_library("gaia_input") { -} - js_library("gaia_password_changed") { - deps = [ "components:oobe_i18n_behavior" ] + deps = [ + "components:login_screen_behavior", + "components:multi_step_behavior", + "components:oobe_dialog_host_behavior", + "components:oobe_i18n_behavior", + ] } js_library("gesture_navigation") { @@ -186,6 +187,15 @@ js_library("offline_gaia") { js_library("oobe_a11y_option") { } +js_library("oobe_adb_sideloading_screen") { + deps = [ + "components:login_screen_behavior", + "components:multi_step_behavior", + "components:oobe_dialog_host_behavior", + "components:oobe_i18n_behavior", + ] +} + js_library("oobe_enable_kiosk") { deps = [ "components:login_screen_behavior", @@ -229,6 +239,7 @@ js_library("oobe_supervision_transition") { js_library("oobe_update") { deps = [ + "components:login_screen_behavior", "components:oobe_dialog_host_behavior", "components:oobe_i18n_behavior", ] @@ -236,13 +247,19 @@ js_library("oobe_update") { js_library("recommend_apps") { deps = [ + "components:login_screen_behavior", + "components:multi_step_behavior", "components:oobe_dialog_host_behavior", "components:oobe_i18n_behavior", + "components:oobe_types", ] } js_library("saml_confirm_password") { - deps = [ "components:oobe_i18n_behavior" ] + deps = [ + "components:oobe_dialog_host_behavior", + "components:oobe_i18n_behavior", + ] } js_library("sync_consent") { diff --git a/chromium/chrome/browser/resources/chromeos/login/components/BUILD.gn b/chromium/chrome/browser/resources/chromeos/login/components/BUILD.gn index 59876172124..a104ef10d39 100644 --- a/chromium/chrome/browser/resources/chromeos/login/components/BUILD.gn +++ b/chromium/chrome/browser/resources/chromeos/login/components/BUILD.gn @@ -11,6 +11,7 @@ js_type_check("closure_compile") { ":hd-iron-icon", ":html-echo", ":login_screen_behavior", + ":multi_step_behavior", ":oobe_buttons", ":oobe_dialog", ":oobe_dialog_host_behavior", @@ -49,6 +50,9 @@ js_library("login_screen_behavior") { ] } +js_library("multi_step_behavior") { +} + js_library("oobe_buttons") { deps = [ ":oobe_i18n_behavior" ] } @@ -56,9 +60,9 @@ js_library("oobe_buttons") { js_library("oobe_dialog") { deps = [ ":fake_oobe", - "//ui/webui/resources/cr_elements:cr_scrollable_behavior", "//ui/webui/resources/cr_elements/cr_lazy_render:cr_lazy_render", ] + externs_list = [ "$externs_path/pending.js" ] } js_library("oobe_dialog_host_behavior") { diff --git a/chromium/chrome/browser/resources/chromeos/network_ui/BUILD.gn b/chromium/chrome/browser/resources/chromeos/network_ui/BUILD.gn index 6060563b75e..85383abad38 100644 --- a/chromium/chrome/browser/resources/chromeos/network_ui/BUILD.gn +++ b/chromium/chrome/browser/resources/chromeos/network_ui/BUILD.gn @@ -5,18 +5,43 @@ import("//third_party/closure_compiler/compile_js.gni") js_type_check("closure_compile") { - deps = [ ":network_ui" ] + deps = [ + ":network_logs_ui", + ":network_state_ui", + ":network_ui", + ":network_ui_browser_proxy", + ] } js_library("network_ui") { deps = [ + ":network_ui_browser_proxy", + "//ui/webui/resources/cr_components/chromeos/network:onc_mojo", + "//ui/webui/resources/js:i18n_behavior", + "//ui/webui/resources/js:load_time_data", + ] +} + +js_library("network_logs_ui") { + deps = [ + ":network_ui_browser_proxy", + "//ui/webui/resources/js:i18n_behavior", + ] +} + +js_library("network_state_ui") { + deps = [ + ":network_ui_browser_proxy", "//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_components/chromeos/network:network_icon", "//ui/webui/resources/cr_components/chromeos/network:network_list", "//ui/webui/resources/cr_components/chromeos/network:onc_mojo", - "//ui/webui/resources/js:load_time_data", - "//ui/webui/resources/js:util", ] - externs_list = [ "$externs_path/networking_private.js" ] + externs_list = chrome_extension_public_externs + + [ "$externs_path/networking_private.js" ] +} + +js_library("network_ui_browser_proxy") { + deps = [ "//ui/webui/resources/js:cr" ] } |