diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-03-11 11:32:04 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-03-18 13:40:17 +0000 |
commit | 31ccca0778db85c159634478b4ec7997f6704860 (patch) | |
tree | 3d33fc3afd9d5ec95541e1bbe074a9cf8da12a0e /chromium/chrome/browser/resources/chromeos/camera/src | |
parent | 248b70b82a40964d5594eb04feca0fa36716185d (diff) |
BASELINE: Update Chromium to 80.0.3987.136
Change-Id: I98e1649aafae85ba3a83e67af00bb27ef301db7b
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Diffstat (limited to 'chromium/chrome/browser/resources/chromeos/camera/src')
6 files changed, 173 insertions, 3 deletions
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 7ea176a9a3f..703e8951e28 100644 --- a/chromium/chrome/browser/resources/chromeos/camera/src/js/BUILD.gn +++ b/chromium/chrome/browser/resources/chromeos/camera/src/js/BUILD.gn @@ -18,30 +18,68 @@ group("closure_compile") { js_type_check("compile_resources") { deps = [ ":background", + ":chrome_util", + ":gallerybutton", ":intent", + ":main", ":metrics", ":nav", - ":resolution_event_broker", + ":sound", ":state", ":toast", ":tooltip", + ":type", ":util", ] } +js_library("chrome_util") { +} + js_library("intent") { deps = [ "mojo:chrome_helper", ] } +js_library("gallerybutton") { + deps = [ + ":chrome_util", + "models:gallery", + ] + externs_list = [ + "$externs_path/file_manager_private.js", + "$externs_path/file_system_provider.js", + ] +} + js_library("metrics") { deps = [ "externs:chrome_platform_analytics", ] } -js_library("resolution_event_broker") { +js_library("sound") { +} + +js_library("type") { +} + +js_library("main") { + deps = [ + ":chrome_util", + ":gallerybutton", + ":intent", + ":state", + "device:constraints_preferrer", + "device:device_info_updater", + "models:gallery", + "views:camera", + "views:camera_intent", + "views:dialog", + "views:settings", + "views:warning", + ] } js_library("nav") { 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 a54df9607b7..0a43ce9d653 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 @@ -15,6 +15,7 @@ js_type_check("closure_compile") { js_library("camera3_device_info") { deps = [ + "..:type", "../mojo:image_capture", ] } @@ -22,8 +23,8 @@ js_library("camera3_device_info") { js_library("constraints_preferrer") { deps = [ ":camera3_device_info", - "..:resolution_event_broker", "..:state", + "..:type", "../browser_proxy:browser_proxy", ] } @@ -34,6 +35,7 @@ js_library("device_info_updater") { ":constraints_preferrer", ":error", "..:state", + "..:type", ] } 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 ba8aca34aad..65264576c4d 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 @@ -22,6 +22,7 @@ js_library("chrome_helper") { js_library("device_operator") { deps = [ + "..:type", "//media/capture/video/chromeos/mojom: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 index d52516bb184..c77f3a005e9 100644 --- a/chromium/chrome/browser/resources/chromeos/camera/src/js/views/BUILD.gn +++ b/chromium/chrome/browser/resources/chromeos/camera/src/js/views/BUILD.gn @@ -13,7 +13,48 @@ group("closure_compile") { js_type_check("compile_resources") { deps = [ + ":camera", + ":camera_intent", + ":dialog", + ":settings", ":view", + ":warning", + ] +} + +js_library("camera") { + deps = [ + "..: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", ] } @@ -21,4 +62,9 @@ js_library("view") { deps = [ "..:toast", ] + + externs_list = [ "../externs/chrome.js" ] +} + +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 index 38a22c262b9..b610cd28173 100644 --- 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 @@ -12,13 +12,69 @@ group("closure_compile") { 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", + "../..: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/camera_strings.grd b/chromium/chrome/browser/resources/chromeos/camera/src/strings/camera_strings.grd index f5c800a6df4..2068ed0af0f 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 @@ -58,10 +58,15 @@ <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" /> @@ -71,35 +76,53 @@ <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_sv.xtb" lang="sv" /> <file path="camera_strings_sw.xtb" lang="sw" /> @@ -108,9 +131,13 @@ <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"> |