Commit 3d28071b authored by rbpotter's avatar rbpotter Committed by Commit Bot

Settings: Migrate zoom_levels, pdf_documents, media_picker to Polymer 3

Migrate these 3 smaller elements in site_settings/ to Polymer 3.

These elements don't have corresponding unit tests.

Bug: 1026426
Change-Id: I8fde01cfc2cf94b5710c5fe70df7ad91fc393927
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2121501
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Reviewed-by: default avatardpapad <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#753768}
parent 6d695657
...@@ -21,12 +21,12 @@ import './site_settings/site_data_details_subpage.m.js'; ...@@ -21,12 +21,12 @@ import './site_settings/site_data_details_subpage.m.js';
import './site_settings/category_default_setting.m.js'; import './site_settings/category_default_setting.m.js';
import './site_settings/category_setting_exceptions.m.js'; import './site_settings/category_setting_exceptions.m.js';
import './site_settings/chooser_exception_list.m.js'; import './site_settings/chooser_exception_list.m.js';
// import './site_settings/media_picker.m.js'; import './site_settings/media_picker.m.js';
// import './site_settings/pdf_documents.m.js'; import './site_settings/pdf_documents.m.js';
// import './site_settings/protocol_handlers.m.js'; // import './site_settings/protocol_handlers.m.js';
import './site_settings/site_data.m.js'; import './site_settings/site_data.m.js';
import './site_settings/site_details.m.js'; import './site_settings/site_details.m.js';
// import './site_settings/zoom_levels.m.js'; import './site_settings/zoom_levels.m.js';
// <if expr="not chromeos"> // <if expr="not chromeos">
import './people_page/import_data_dialog.m.js'; import './people_page/import_data_dialog.m.js';
......
...@@ -625,6 +625,14 @@ ...@@ -625,6 +625,14 @@
file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/local_data_browser_proxy.m.js" file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/local_data_browser_proxy.m.js"
use_base_dir="false" use_base_dir="false"
type="BINDATA" /> type="BINDATA" />
<include name="IDR_SETTINGS_SITE_SETTINGS_MEDIA_PICKER_M_JS"
file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/media_picker.m.js"
use_base_dir="false"
type="BINDATA" />
<include name="IDR_SETTINGS_SITE_SETTINGS_PDF_DOCUMENTS_M_JS"
file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/pdf_documents.m.js"
use_base_dir="false"
type="BINDATA" />
<include name="IDR_SETTINGS_SITE_SETTINGS_SITE_DATA_M_JS" <include name="IDR_SETTINGS_SITE_SETTINGS_SITE_DATA_M_JS"
file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/site_data.m.js" file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/site_data.m.js"
use_base_dir="false" use_base_dir="false"
...@@ -674,6 +682,10 @@ ...@@ -674,6 +682,10 @@
file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/website_usage_browser_proxy.m.js" file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/website_usage_browser_proxy.m.js"
use_base_dir="false" use_base_dir="false"
type="BINDATA" /> type="BINDATA" />
<include name="IDR_SETTINGS_SITE_SETTINGS_ZOOM_LEVELS_M_JS"
file="${root_gen_dir}/chrome/browser/resources/settings/site_settings/zoom_levels.m.js"
use_base_dir="false"
type="BINDATA" />
<if expr="not chromeos"> <if expr="not chromeos">
<include name="IDR_SETTINGS_PRINTING_PAGE_PRINTING_BROWSER_PROXY_M_JS" <include name="IDR_SETTINGS_PRINTING_PAGE_PRINTING_BROWSER_PROXY_M_JS"
file="${root_gen_dir}/chrome/browser/resources/settings/printing_page/printing_browser_proxy.m.js" file="${root_gen_dir}/chrome/browser/resources/settings/printing_page/printing_browser_proxy.m.js"
......
...@@ -310,9 +310,9 @@ js_type_check("closure_compile_module") { ...@@ -310,9 +310,9 @@ js_type_check("closure_compile_module") {
":cookie_info.m", ":cookie_info.m",
":edit_exception_dialog.m", ":edit_exception_dialog.m",
":local_data_browser_proxy.m", ":local_data_browser_proxy.m",
":media_picker.m",
":pdf_documents.m",
# ":media_picker.m",
# ":pdf_documents.m",
# ":protocol_handlers.m", # ":protocol_handlers.m",
":site_data.m", ":site_data.m",
":site_data_details_subpage.m", ":site_data_details_subpage.m",
...@@ -325,8 +325,7 @@ js_type_check("closure_compile_module") { ...@@ -325,8 +325,7 @@ js_type_check("closure_compile_module") {
":site_settings_behavior.m", ":site_settings_behavior.m",
":site_settings_prefs_browser_proxy.m", ":site_settings_prefs_browser_proxy.m",
":website_usage_browser_proxy.m", ":website_usage_browser_proxy.m",
":zoom_levels.m",
# ":zoom_levels.m",
] ]
} }
...@@ -445,7 +444,10 @@ js_library("local_data_browser_proxy.m") { ...@@ -445,7 +444,10 @@ js_library("local_data_browser_proxy.m") {
js_library("media_picker.m") { js_library("media_picker.m") {
sources = [ "$root_gen_dir/chrome/browser/resources/settings/site_settings/media_picker.m.js" ] sources = [ "$root_gen_dir/chrome/browser/resources/settings/site_settings/media_picker.m.js" ]
deps = [ deps = [
# TODO: Fill those in. ":site_settings_behavior.m",
":site_settings_prefs_browser_proxy.m",
"//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
"//ui/webui/resources/js:web_ui_listener_behavior.m",
] ]
extra_deps = [ ":media_picker_module" ] extra_deps = [ ":media_picker_module" ]
} }
...@@ -453,7 +455,7 @@ js_library("media_picker.m") { ...@@ -453,7 +455,7 @@ js_library("media_picker.m") {
js_library("pdf_documents.m") { js_library("pdf_documents.m") {
sources = [ "$root_gen_dir/chrome/browser/resources/settings/site_settings/pdf_documents.m.js" ] sources = [ "$root_gen_dir/chrome/browser/resources/settings/site_settings/pdf_documents.m.js" ]
deps = [ deps = [
# TODO: Fill those in. "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
] ]
extra_deps = [ ":pdf_documents_module" ] extra_deps = [ ":pdf_documents_module" ]
} }
...@@ -475,6 +477,7 @@ js_library("site_data.m") { ...@@ -475,6 +477,7 @@ js_library("site_data.m") {
":site_settings_behavior.m", ":site_settings_behavior.m",
"..:global_scroll_target_behavior.m", "..:global_scroll_target_behavior.m",
"..:route.m", "..:route.m",
"//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
"//ui/webui/resources/cr_elements/cr_search_field:cr_search_field.m", "//ui/webui/resources/cr_elements/cr_search_field:cr_search_field.m",
"//ui/webui/resources/js:assert.m", "//ui/webui/resources/js:assert.m",
"//ui/webui/resources/js:cr.m", "//ui/webui/resources/js:cr.m",
...@@ -626,7 +629,11 @@ js_library("website_usage_browser_proxy.m") { ...@@ -626,7 +629,11 @@ js_library("website_usage_browser_proxy.m") {
js_library("zoom_levels.m") { js_library("zoom_levels.m") {
sources = [ "$root_gen_dir/chrome/browser/resources/settings/site_settings/zoom_levels.m.js" ] sources = [ "$root_gen_dir/chrome/browser/resources/settings/site_settings/zoom_levels.m.js" ]
deps = [ deps = [
# TODO: Fill those in. ":site_settings_behavior.m",
":site_settings_prefs_browser_proxy.m",
"//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
"//ui/webui/resources/js:list_property_update_behavior.m",
"//ui/webui/resources/js:web_ui_listener_behavior.m",
] ]
extra_deps = [ ":zoom_levels_module" ] extra_deps = [ ":zoom_levels_module" ]
} }
...@@ -741,6 +748,8 @@ polymer_modulizer("media_picker") { ...@@ -741,6 +748,8 @@ polymer_modulizer("media_picker") {
js_file = "media_picker.js" js_file = "media_picker.js"
html_file = "media_picker.html" html_file = "media_picker.html"
html_type = "dom-module" html_type = "dom-module"
auto_imports = settings_auto_imports + [ "chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.html|MediaPickerEntry" ]
namespace_rewrites = settings_namespace_rewrites
} }
polymer_modulizer("pdf_documents") { polymer_modulizer("pdf_documents") {
...@@ -863,6 +872,8 @@ polymer_modulizer("zoom_levels") { ...@@ -863,6 +872,8 @@ polymer_modulizer("zoom_levels") {
js_file = "zoom_levels.js" js_file = "zoom_levels.js"
html_file = "zoom_levels.html" html_file = "zoom_levels.html"
html_type = "dom-module" html_type = "dom-module"
auto_imports = settings_auto_imports + [ "chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.html|ZoomLevelEntry" ]
namespace_rewrites = settings_namespace_rewrites
} }
js_modulizer("modulize") { js_modulizer("modulize") {
......
<link rel="import" href="chrome://resources/html/polymer.html"> <link rel="import" href="chrome://resources/html/polymer.html">
<link rel="import" href="chrome://resources/cr_elements/md_select_css.html"> <link rel="import" href="chrome://resources/cr_elements/md_select_css.html">
<link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
<link rel="import" href="../settings_shared_css.html"> <link rel="import" href="../settings_shared_css.html">
<link rel="import" href="../settings_vars_css.html"> <link rel="import" href="../settings_vars_css.html">
<link rel="import" href="site_settings_behavior.html">
<link rel="import" href="site_settings_prefs_browser_proxy.html">
<dom-module id="media-picker"> <dom-module id="media-picker">
<template> <template>
......
...@@ -151,7 +151,7 @@ let RecentSitePermissions; ...@@ -151,7 +151,7 @@ let RecentSitePermissions;
* @typedef {{name: string, * @typedef {{name: string,
* id: string}} * id: string}}
*/ */
let MediaPickerEntry; /* #export */ let MediaPickerEntry;
/** /**
* @typedef {{protocol: string, * @typedef {{protocol: string,
...@@ -165,7 +165,7 @@ let ProtocolHandlerEntry; ...@@ -165,7 +165,7 @@ let ProtocolHandlerEntry;
* source: string, * source: string,
* zoom: string}} * zoom: string}}
*/ */
let ZoomLevelEntry; /* #export */ let ZoomLevelEntry;
cr.define('settings', function() { cr.define('settings', function() {
/** @interface */ /** @interface */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment