diff options
Diffstat (limited to 'chromium/chrome/browser/resources/chromeos/camera')
9 files changed, 113 insertions, 18 deletions
diff --git a/chromium/chrome/browser/resources/chromeos/camera/BUILD.gn b/chromium/chrome/browser/resources/chromeos/camera/BUILD.gn index 813d058f946..d41c627794d 100644 --- a/chromium/chrome/browser/resources/chromeos/camera/BUILD.gn +++ b/chromium/chrome/browser/resources/chromeos/camera/BUILD.gn @@ -158,6 +158,8 @@ copy("chrome_camera_app_js_models") { "src/js/models/filenamer.js", "src/js/models/filesystem.js", "src/js/models/gallery.js", + "src/js/models/result_saver.js", + "src/js/models/video_saver.js", ] outputs = [ @@ -167,7 +169,8 @@ copy("chrome_camera_app_js_models") { copy("chrome_camera_app_js_mojo") { sources = [ - "src/js/mojo/imagecapture.js", + "src/js/mojo/device_operator.js", + "src/js/mojo/image_capture.js", ] outputs = [ @@ -232,17 +235,21 @@ copy("chrome_camera_app_views") { copy("chrome_camera_app_mojo_generated") { sources = [ "$root_gen_dir/media/capture/mojom/image_capture.mojom-lite.js", - "$root_gen_dir/media/capture/video/chromeos/mojo/camera_common.mojom-lite.js", - "$root_gen_dir/media/capture/video/chromeos/mojo/camera_metadata.mojom-lite.js", - "$root_gen_dir/media/capture/video/chromeos/mojo/camera_metadata_tags.mojom-lite.js", - "$root_gen_dir/media/capture/video/chromeos/mojo/cros_image_capture.mojom-lite.js", + "$root_gen_dir/media/capture/video/chromeos/mojom/camera_app.mojom-lite.js", + "$root_gen_dir/media/capture/video/chromeos/mojom/camera_common.mojom-lite.js", + "$root_gen_dir/media/capture/video/chromeos/mojom/camera_metadata.mojom-lite.js", + "$root_gen_dir/media/capture/video/chromeos/mojom/camera_metadata_tags.mojom-lite.js", "$root_gen_dir/mojo/public/js/mojo_bindings_lite.js", + "$root_gen_dir/ui/gfx/geometry/mojom/geometry.mojom-lite.js", + "$root_gen_dir/ui/gfx/range/mojom/range.mojom-lite.js", ] deps = [ "//media/capture/mojom:image_capture_js", - "//media/capture/video/chromeos/mojo:cros_camera_js", + "//media/capture/video/chromeos/mojom:cros_camera_js", "//mojo/public/js:bindings_lite", + "//ui/gfx/geometry/mojom:mojom_js", + "//ui/gfx/range/mojom:mojom_js", ] outputs = [ diff --git a/chromium/chrome/browser/resources/chromeos/camera/camera_resources.grd b/chromium/chrome/browser/resources/chromeos/camera/camera_resources.grd index 0f24c24ff64..0a9ac124ab1 100644 --- a/chromium/chrome/browser/resources/chromeos/camera/camera_resources.grd +++ b/chromium/chrome/browser/resources/chromeos/camera/camera_resources.grd @@ -18,6 +18,7 @@ <structure name="IDR_CAMERA_CAMERA3_DEVICE_INFO_JS" file="src/js/device/camera3_device_info.js" type="chrome_html" /> <structure name="IDR_CAMERA_CAMERA_JS" file="src/js/views/camera.js" type="chrome_html" /> <structure name="IDR_CAMERA_CONSTRAINTS_PREFERRER_JS" file="src/js/device/constraints_preferrer.js" type="chrome_html" /> + <structure name="IDR_CAMERA_DEVICE_OPERATOR_JS" file="src/js/mojo/device_operator.js" type="chrome_html" /> <structure name="IDR_CAMERA_DEVICE_INFO_UPDATER_JS" file="src/js/device/device_info_updater.js" type="chrome_html" /> <structure name="IDR_CAMERA_DIALOG_JS" file="src/js/views/dialog.js" type="chrome_html" /> <structure name="IDR_CAMERA_FILENAMER_JS" file="src/js/models/filenamer.js" type="chrome_html" /> @@ -25,7 +26,7 @@ <structure name="IDR_CAMERA_GALLERY_BASE_JS" file="src/js/views/gallery_base.js" type="chrome_html" /> <structure name="IDR_CAMERA_GALLERY_JS" file="src/js/models/gallery.js" type="chrome_html" /> <structure name="IDR_CAMERA_GALLERYBUTTON_JS" file="src/js/gallerybutton.js" type="chrome_html" /> - <structure name="IDR_CAMERA_IMAGECAPTURE_JS" file="src/js/mojo/imagecapture.js" type="chrome_html" /> + <structure name="IDR_CAMERA_IMAGECAPTURE_JS" file="src/js/mojo/image_capture.js" type="chrome_html" /> <structure name="IDR_CAMERA_LAYOUT_JS" file="src/js/views/camera/layout.js" type="chrome_html" /> <structure name="IDR_CAMERA_MAIN_CSS" file="src/css/main.css" type="chrome_html" /> <structure name="IDR_CAMERA_MAIN_HTML" file="src/views/main.html" type="chrome_html" /> @@ -38,6 +39,7 @@ <structure name="IDR_CAMERA_PREVIEW_JS" file="src/js/views/camera/preview.js" type="chrome_html" /> <structure name="IDR_CAMERA_RECORDTIME_JS" file="src/js/views/camera/recordtime.js" type="chrome_html" /> <structure name="IDR_CAMERA_RESOLUTION_EVENT_BROKER_JS" file="src/js/resolution_event_broker.js" type="chrome_html" /> + <structure name="IDR_CAMERA_RESULT_SAVER_JS" file="src/js/models/result_saver.js" type="chrome_html" /> <structure name="IDR_CAMERA_SCROLLBAR_JS" file="src/js/scrollbar.js" type="chrome_html" /> <structure name="IDR_CAMERA_SETTINGS_JS" file="src/js/views/settings.js" type="chrome_html" /> <structure name="IDR_CAMERA_SOUND_JS" file="src/js/sound.js" type="chrome_html" /> @@ -46,6 +48,7 @@ <structure name="IDR_CAMERA_TOAST_JS" file="src/js/toast.js" type="chrome_html" /> <structure name="IDR_CAMERA_TOOLTIP_JS" file="src/js/tooltip.js" type="chrome_html" /> <structure name="IDR_CAMERA_UTIL_JS" file="src/js/util.js" type="chrome_html" /> + <structure name="IDR_CAMERA_VIDEO_SAVER_JS" file="src/js/models/video_saver.js" type="chrome_html" /> <structure name="IDR_CAMERA_VIEW_JS" file="src/js/views/view.js" type="chrome_html" /> <structure name="IDR_CAMERA_WARNING_JS" file="src/js/views/warning.js" type="chrome_html" /> <structure name="IDR_CAMERA_WEBUI_BROWSER_PROXY" file="src/js/browser_proxy/webui_browser_proxy.js" type="chrome_html" /> @@ -57,19 +60,19 @@ use_base_dir="false" type="BINDATA"/> <include name="IDR_CAMERA_CAMERA_COMMON_MOJOM_LITE_JS" - file="${root_gen_dir}/media/capture/video/chromeos/mojo/camera_common.mojom-lite.js" + file="${root_gen_dir}/media/capture/video/chromeos/mojom/camera_common.mojom-lite.js" use_base_dir="false" type="BINDATA"/> <include name="IDR_CAMERA_CAMERA_METADATA_MOJOM_LITE_JS" - file="${root_gen_dir}/media/capture/video/chromeos/mojo/camera_metadata.mojom-lite.js" + file="${root_gen_dir}/media/capture/video/chromeos/mojom/camera_metadata.mojom-lite.js" use_base_dir="false" type="BINDATA"/> <include name="IDR_CAMERA_CAMERA_METADATA_TAGS_MOJOM_LITE_JS" - file="${root_gen_dir}/media/capture/video/chromeos/mojo/camera_metadata_tags.mojom-lite.js" + file="${root_gen_dir}/media/capture/video/chromeos/mojom/camera_metadata_tags.mojom-lite.js" use_base_dir="false" type="BINDATA"/> - <include name="IDR_CAMERA_CROS_IMAGE_CAPTURE_MOJOM_LITE_JS" - file="${root_gen_dir}/media/capture/video/chromeos/mojo/cros_image_capture.mojom-lite.js" + <include name="IDR_CAMERA_APP_MOJOM_LITE_JS" + file="${root_gen_dir}/media/capture/video/chromeos/mojom/camera_app.mojom-lite.js" use_base_dir="false" type="BINDATA"/> diff --git a/chromium/chrome/browser/resources/chromeos/camera/src/_locales/en/messages.json b/chromium/chrome/browser/resources/chromeos/camera/src/_locales/en/messages.json index 5a9f048411f..cf3600060c5 100644 --- a/chromium/chrome/browser/resources/chromeos/camera/src/_locales/en/messages.json +++ b/chromium/chrome/browser/resources/chromeos/camera/src/_locales/en/messages.json @@ -45,6 +45,10 @@ "message": "Nothing recorded", "description": "Error message shown when no data is recorded for a recording and it won't be added to the gallery." }, + "ERROR_MSG_EXPERT_MODE_NOT_SUPPORTED": { + "message": "Expert mode is not supported on this device", + "description": "Error message when the device does not support expert mode but tries to enable it." + }, "STATUS_MSG_RECORDING_STOPPED": { "message": "Recording stopped", "description": "Status message for spoken feedback when video recording has been stopped." @@ -103,6 +107,18 @@ "message": "Camera resolution", "description": "Label for the button of camera resolution options." }, + "EXPERT_MODE_BUTTON": { + "message": "Expert mode", + "description": "Label for the button of expert mode options." + }, + "EXPERT_PREVIEW_METADATA": { + "message": "Preview metadata", + "description": "Label for expert mode option: preview metadata." + }, + "EXPERT_SAVE_METADATA": { + "message": "Save metadata", + "description": "Label for expert mode option: save metadata." + }, "FEEDBACK_BUTTON": { "message": "Send feedback", "description": "Label for the feedback button." diff --git a/chromium/chrome/browser/resources/chromeos/camera/src/js/BUILD.gn b/chromium/chrome/browser/resources/chromeos/camera/src/js/BUILD.gn index 7a0dd53b11e..059505eb02c 100644 --- a/chromium/chrome/browser/resources/chromeos/camera/src/js/BUILD.gn +++ b/chromium/chrome/browser/resources/chromeos/camera/src/js/BUILD.gn @@ -11,13 +11,16 @@ group("closure_compile") { "device:closure_compile", "models:closure_compile", "mojo:closure_compile", + "views:closure_compile", ] } js_type_check("compile_resources") { deps = [ + ":nav", ":resolution_event_broker", ":state", + ":toast", ":tooltip", ":util", ] @@ -26,9 +29,22 @@ js_type_check("compile_resources") { js_library("resolution_event_broker") { } +js_library("nav") { + deps = [ + "mojo:device_operator", + "views:view", + ] +} + js_library("state") { } +js_library("toast") { + deps = [ + ":util", + ] +} + js_library("tooltip") { } diff --git a/chromium/chrome/browser/resources/chromeos/camera/src/js/device/BUILD.gn b/chromium/chrome/browser/resources/chromeos/camera/src/js/device/BUILD.gn index 013d454061a..cc01ba9b370 100644 --- a/chromium/chrome/browser/resources/chromeos/camera/src/js/device/BUILD.gn +++ b/chromium/chrome/browser/resources/chromeos/camera/src/js/device/BUILD.gn @@ -14,22 +14,23 @@ js_type_check("closure_compile") { js_library("camera3_device_info") { deps = [ - "../mojo:imagecapture", + "../mojo:image_capture", ] } js_library("constraints_preferrer") { deps = [ + ":camera3_device_info", "..:resolution_event_broker", + "..:state", "../browser_proxy:browser_proxy", ] } js_library("device_info_updater") { deps = [ - "..:state", - "../mojo:imagecapture", ":camera3_device_info", ":constraints_preferrer", + "..:state", ] } diff --git a/chromium/chrome/browser/resources/chromeos/camera/src/js/models/BUILD.gn b/chromium/chrome/browser/resources/chromeos/camera/src/js/models/BUILD.gn index 89ebf568fe6..db0f77e3e3f 100644 --- a/chromium/chrome/browser/resources/chromeos/camera/src/js/models/BUILD.gn +++ b/chromium/chrome/browser/resources/chromeos/camera/src/js/models/BUILD.gn @@ -9,6 +9,8 @@ js_type_check("closure_compile") { ":filenamer", ":filesystem", ":gallery", + ":result_saver", + ":video_saver", ] } @@ -26,3 +28,9 @@ js_library("gallery") { ":filesystem", ] } + +js_library("result_saver") { +} + +js_library("video_saver") { +} diff --git a/chromium/chrome/browser/resources/chromeos/camera/src/js/mojo/BUILD.gn b/chromium/chrome/browser/resources/chromeos/camera/src/js/mojo/BUILD.gn index 9d131abf33c..3be85b7f5c2 100644 --- a/chromium/chrome/browser/resources/chromeos/camera/src/js/mojo/BUILD.gn +++ b/chromium/chrome/browser/resources/chromeos/camera/src/js/mojo/BUILD.gn @@ -6,14 +6,23 @@ import("//third_party/closure_compiler/compile_js.gni") js_type_check("closure_compile") { deps = [ - ":imagecapture", + ":device_operator", + ":image_capture", ] } -js_library("imagecapture") { +js_library("device_operator") { deps = [ + "//media/capture/video/chromeos/mojom:cros_camera_js_library_for_compile", + ] + externs_list = [ "$externs_path/pending.js" ] +} + +js_library("image_capture") { + deps = [ + ":device_operator", + "..:util", "//media/capture/mojom:image_capture_js_library_for_compile", - "//media/capture/video/chromeos/mojo:cros_camera_js_library_for_compile", ] externs_list = [ "$externs_path/pending.js" ] } diff --git a/chromium/chrome/browser/resources/chromeos/camera/src/js/views/BUILD.gn b/chromium/chrome/browser/resources/chromeos/camera/src/js/views/BUILD.gn new file mode 100644 index 00000000000..84560373b2c --- /dev/null +++ b/chromium/chrome/browser/resources/chromeos/camera/src/js/views/BUILD.gn @@ -0,0 +1,23 @@ +# Copyright 2019 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//third_party/closure_compiler/compile_js.gni") + +group("closure_compile") { + deps = [ + ":compile_resources", + ] +} + +js_type_check("compile_resources") { + deps = [ + ":view", + ] +} + +js_library("view") { + deps = [ + "..:toast", + ] +} diff --git a/chromium/chrome/browser/resources/chromeos/camera/src/strings/camera_strings.grd b/chromium/chrome/browser/resources/chromeos/camera/src/strings/camera_strings.grd index 834cc2109d1..299d99fff8c 100644 --- a/chromium/chrome/browser/resources/chromeos/camera/src/strings/camera_strings.grd +++ b/chromium/chrome/browser/resources/chromeos/camera/src/strings/camera_strings.grd @@ -222,6 +222,18 @@ <message desc="Label for the checkbox to toggle the microphone for recording video." name="IDS_TOGGLE_MIC_BUTTON"> Microphone </message> + <message desc="Label for the button of expert mode options." name="IDS_EXPERT_MODE_BUTTON"> + Expert mode + </message> + <message desc="Label for expert mode option: preview metadata." name="IDS_EXPERT_PREVIEW_METADATA"> + Preview metadata + </message> + <message desc="Label for expert mode option: save metadata." name="IDS_EXPERT_SAVE_METADATA"> + Save metadata + </message> + <message desc="Error message when the device does not support expert mode but tries to enable it." name="IDS_ERROR_MSG_EXPERT_MODE_NOT_SUPPORTED"> + Expert mode is not supported on this device + </message> <message desc="Label for the feedback button." name="IDS_FEEDBACK_BUTTON"> Send feedback </message> |