Skip to content

GitLab

T
tangled
Commit c5db0b25 authored by rbpotter's avatar rbpotter Committed by Commit Bot
Browse files
Options

Settings: Check in appearance_page/* Polymer 3 

Leave fonts_browser_proxy autogenerated since it is used by OS settings.

Bug: 1069258
Change-Id: I7bd27c81477499b4171e27b7da32c9817724b5cb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2155435
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Reviewed-by: default avatardpapad <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#761010}
parent afe9ee13
Hide whitespace changes
Inline Side-by-side
Showing with 104 additions and 220 deletions
chrome/browser/resources/settings/appearance_page/BUILD.gn
View file @ c5db0b25
...@@ -8,56 +8,7 @@ import("//ui/webui/resources/tools/js_modulizer.gni") ...@@ -8,56 +8,7 @@ import("//ui/webui/resources/tools/js_modulizer.gni")
import("../settings.gni") import("../settings.gni")
js_type_check("closure_compile") { js_type_check("closure_compile") {
deps = [ deps = [ ":fonts_browser_proxy" ]
":appearance_browser_proxy",
":appearance_fonts_page",
":appearance_page",
":fonts_browser_proxy",
":home_url_input",
]
}
js_library("appearance_fonts_page") {
deps = [
":fonts_browser_proxy",
"../controls:settings_dropdown_menu",
"//ui/webui/resources/cr_elements/cr_slider:cr_slider",
"//ui/webui/resources/js:cr",
"//ui/webui/resources/js:i18n_behavior",
"//ui/webui/resources/js:web_ui_listener_behavior",
]
externs_list = [ "$externs_path/chrome_send.js" ]
}
js_library("appearance_browser_proxy") {
deps = [
"//ui/webui/resources/js:assert",
"//ui/webui/resources/js:cr",
"//ui/webui/resources/js:load_time_data",
]
externs_list = [
"$externs_path/chrome_send.js",
"$externs_path/management.js",
"$externs_path/settings_private.js",
]
}
js_library("appearance_page") {
deps = [
":appearance_browser_proxy",
"..:page_visibility",
"..:route",
"..:router",
"../controls:settings_dropdown_menu",
"../settings_page:settings_animated_pages",
"//ui/webui/resources/js:cr",
"//ui/webui/resources/js:i18n_behavior",
"//ui/webui/resources/js:load_time_data",
]
externs_list = [
"$externs_path/settings_private.js",
"$externs_path/chrome_send.js",
]
} }
js_library("fonts_browser_proxy") { js_library("fonts_browser_proxy") {
...@@ -68,45 +19,30 @@ js_library("fonts_browser_proxy") { ...@@ -68,45 +19,30 @@ js_library("fonts_browser_proxy") {
externs_list = [ "$externs_path/chrome_send.js" ] externs_list = [ "$externs_path/chrome_send.js" ]
} }
js_library("home_url_input") {
deps = [
":appearance_browser_proxy",
"../controls:pref_control_behavior",
"//ui/webui/resources/cr_elements/policy:cr_policy_indicator_behavior",
"//ui/webui/resources/cr_elements/policy:cr_policy_pref_behavior",
"//ui/webui/resources/js:assert",
"//ui/webui/resources/js:load_time_data",
]
externs_list = [ "$externs_path/settings_private.js" ]
}
js_type_check("closure_compile_module") { js_type_check("closure_compile_module") {
is_polymer3 = true is_polymer3 = true
closure_flags = settings_closure_flags
deps = [ deps = [
":appearance_browser_proxy.m", ":appearance_browser_proxy",
":appearance_fonts_page.m", ":appearance_fonts_page",
":appearance_page.m", ":appearance_page",
":fonts_browser_proxy.m", ":fonts_browser_proxy.m",
":home_url_input.m", ":home_url_input",
] ]
} }
js_library("appearance_browser_proxy.m") { js_library("appearance_browser_proxy") {
sources = [ "$root_gen_dir/chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.m.js" ]
deps = [ deps = [
"//ui/webui/resources/js:cr.m", "//ui/webui/resources/js:cr.m",
"//ui/webui/resources/js:load_time_data.m", "//ui/webui/resources/js:load_time_data.m",
] ]
externs_list = [ externs_list = [
"$externs_path/chrome_send.js",
"$externs_path/management.js", "$externs_path/management.js",
"$externs_path/settings_private.js", "$externs_path/settings_private.js",
] ]
extra_deps = [ ":modulize" ]
} }
js_library("appearance_fonts_page.m") { js_library("appearance_fonts_page") {
sources = [ "$root_gen_dir/chrome/browser/resources/settings/appearance_page/appearance_fonts_page.m.js" ]
deps = [ deps = [
":fonts_browser_proxy.m", ":fonts_browser_proxy.m",
"../controls:settings_dropdown_menu.m", "../controls:settings_dropdown_menu.m",
...@@ -115,14 +51,11 @@ js_library("appearance_fonts_page.m") { ...@@ -115,14 +51,11 @@ js_library("appearance_fonts_page.m") {
"//ui/webui/resources/js:i18n_behavior.m", "//ui/webui/resources/js:i18n_behavior.m",
"//ui/webui/resources/js:web_ui_listener_behavior.m", "//ui/webui/resources/js:web_ui_listener_behavior.m",
] ]
externs_list = [ "$externs_path/chrome_send.js" ]
extra_deps = [ ":appearance_fonts_page_module" ]
} }
js_library("appearance_page.m") { js_library("appearance_page") {
sources = [ "$root_gen_dir/chrome/browser/resources/settings/appearance_page/appearance_page.m.js" ]
deps = [ deps = [
":appearance_browser_proxy.m", ":appearance_browser_proxy",
"..:page_visibility.m", "..:page_visibility.m",
"..:route.m", "..:route.m",
"..:router.m", "..:router.m",
...@@ -132,11 +65,6 @@ js_library("appearance_page.m") { ...@@ -132,11 +65,6 @@ js_library("appearance_page.m") {
"//ui/webui/resources/js:i18n_behavior.m", "//ui/webui/resources/js:i18n_behavior.m",
"//ui/webui/resources/js:load_time_data.m", "//ui/webui/resources/js:load_time_data.m",
] ]
externs_list = [
"$externs_path/settings_private.js",
"$externs_path/chrome_send.js",
]
extra_deps = [ ":appearance_page_module" ]
} }
js_library("fonts_browser_proxy.m") { js_library("fonts_browser_proxy.m") {
...@@ -145,10 +73,9 @@ js_library("fonts_browser_proxy.m") { ...@@ -145,10 +73,9 @@ js_library("fonts_browser_proxy.m") {
extra_deps = [ ":modulize" ] extra_deps = [ ":modulize" ]
} }
js_library("home_url_input.m") { js_library("home_url_input") {
sources = [ "$root_gen_dir/chrome/browser/resources/settings/appearance_page/home_url_input.m.js" ]
deps = [ deps = [
":appearance_browser_proxy.m", ":appearance_browser_proxy",
"../controls:pref_control_behavior.m", "../controls:pref_control_behavior.m",
"//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
"//ui/webui/resources/cr_elements/policy:cr_policy_indicator_behavior.m", "//ui/webui/resources/cr_elements/policy:cr_policy_indicator_behavior.m",
...@@ -156,7 +83,6 @@ js_library("home_url_input.m") { ...@@ -156,7 +83,6 @@ js_library("home_url_input.m") {
"//ui/webui/resources/js:assert.m", "//ui/webui/resources/js:assert.m",
"//ui/webui/resources/js:load_time_data.m", "//ui/webui/resources/js:load_time_data.m",
] ]
extra_deps = [ ":home_url_input_module" ]
} }
group("polymer3_elements") { group("polymer3_elements") {
...@@ -171,45 +97,22 @@ group("polymer3_elements") { ...@@ -171,45 +97,22 @@ group("polymer3_elements") {
polymer_modulizer("appearance_fonts_page") { polymer_modulizer("appearance_fonts_page") {
js_file = "appearance_fonts_page.js" js_file = "appearance_fonts_page.js"
html_file = "appearance_fonts_page.html" html_file = "appearance_fonts_page.html"
html_type = "dom-module" html_type = "v3-ready"
auto_imports = settings_auto_imports + [
"ui/webui/resources/cr_elements/cr_slider/cr_slider.html|SliderTick",
"chrome/browser/resources/settings/appearance_page/fonts_browser_proxy.html|FontsBrowserProxy, FontsBrowserProxyImpl, FontsData",
"chrome/browser/resources/settings/controls/settings_dropdown_menu.html|DropdownMenuOptionList",
]
namespace_rewrites = settings_namespace_rewrites
} }
polymer_modulizer("appearance_page") { polymer_modulizer("appearance_page") {
js_file = "appearance_page.js" js_file = "appearance_page.js"
html_file = "appearance_page.html" html_file = "appearance_page.html"
html_type = "dom-module" html_type = "v3-ready"
auto_imports = settings_auto_imports + [
"ui/webui/resources/html/assert.html|assert",
"chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.html|AppearanceBrowserProxy, AppearanceBrowserProxyImpl",
"chrome/browser/resources/settings/controls/settings_dropdown_menu.html|DropdownMenuOptionList",
"chrome/browser/resources/settings/page_visibility.html|AppearancePageVisibility",
"chrome/browser/resources/settings/route.html|routes",
"chrome/browser/resources/settings/router.html|Router",
]
namespace_rewrites = settings_namespace_rewrites
} }
polymer_modulizer("home_url_input") { polymer_modulizer("home_url_input") {
js_file = "home_url_input.js" js_file = "home_url_input.js"
html_file = "home_url_input.html" html_file = "home_url_input.html"
html_type = "dom-module" html_type = "v3-ready"
namespace_rewrites = settings_namespace_rewrites
auto_imports = settings_auto_imports + [
"ui/webui/resources/html/assert.html|assert",
"chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.html|AppearanceBrowserProxy, AppearanceBrowserProxyImpl",
]
} }
js_modulizer("modulize") { js_modulizer("modulize") {
input_files = [ input_files = [ "fonts_browser_proxy.js" ]
"appearance_browser_proxy.js",
"fonts_browser_proxy.js",
]
namespace_rewrites = settings_namespace_rewrites namespace_rewrites = settings_namespace_rewrites
} }
chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.html deleted 100644 → 0
View file @ afe9ee13
<link rel="href" src="chrome://resources/html/cr.html">
<link rel="href" src="chrome://resources/html/load_time_data.html">
<script src="appearance_browser_proxy.js"></script>
chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.js
View file @ c5db0b25
...@@ -3,13 +3,12 @@ ...@@ -3,13 +3,12 @@
// found in the LICENSE file. // found in the LICENSE file.
// clang-format off // clang-format off
// #import {addSingletonGetter, sendWithPromise} from 'chrome://resources/js/cr.m.js'; import {addSingletonGetter, sendWithPromise} from 'chrome://resources/js/cr.m.js';
// #import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js'; import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js';
// clang-format on // clang-format on
cr.define('settings', function() {
/** @interface */ /** @interface */
/* #export */ class AppearanceBrowserProxy { export class AppearanceBrowserProxy {
/** @return {!Promise<number>} */ /** @return {!Promise<number>} */
getDefaultZoom() {} getDefaultZoom() {}
...@@ -37,9 +36,9 @@ cr.define('settings', function() { ...@@ -37,9 +36,9 @@ cr.define('settings', function() {
} }
/** /**
* @implements {settings.AppearanceBrowserProxy} * @implements {AppearanceBrowserProxy}
*/ */
/* #export */ class AppearanceBrowserProxyImpl { export class AppearanceBrowserProxyImpl {
/** @override */ /** @override */
getDefaultZoom() { getDefaultZoom() {
return new Promise(function(resolve) { return new Promise(function(resolve) {
...@@ -74,15 +73,9 @@ cr.define('settings', function() { ...@@ -74,15 +73,9 @@ cr.define('settings', function() {
/** @override */ /** @override */
validateStartupPage(url) { validateStartupPage(url) {
return cr.sendWithPromise('validateStartupPage', url); return sendWithPromise('validateStartupPage', url);
} }
} }
cr.addSingletonGetter(AppearanceBrowserProxyImpl); addSingletonGetter(AppearanceBrowserProxyImpl);
// #cr_define_end
return {
AppearanceBrowserProxy: AppearanceBrowserProxy,
AppearanceBrowserProxyImpl: AppearanceBrowserProxyImpl,
};
});
chrome/browser/resources/settings/appearance_page/appearance_fonts_page.html
View file @ c5db0b25
<link rel="import" href="chrome://resources/html/polymer.html">
<link rel="import" href="chrome://resources/cr_elements/cr_slider/cr_slider.html">
<link rel="import" href="chrome://resources/cr_elements/shared_style_css.html">
<link rel="import" href="chrome://resources/html/i18n_behavior.html">
<link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html">
<link rel="import" href="fonts_browser_proxy.html">
<link rel="import" href="../controls/settings_slider.html">
<link rel="import" href="../controls/settings_dropdown_menu.html">
<link rel="import" href="../i18n_setup.html">
<link rel="import" href="../settings_shared_css.html">
<dom-module id="settings-appearance-fonts-page">
<template>
<style include="cr-shared-style settings-shared iron-flex"> <style include="cr-shared-style settings-shared iron-flex">
#minimumSize { #minimumSize {
align-items: flex-end; align-items: flex-end;
...@@ -139,6 +124,3 @@ ...@@ -139,6 +124,3 @@
$i18n{quickBrownFox} $i18n{quickBrownFox}
</div> </div>
</div> </div>
</template>
<script src="appearance_fonts_page.js"></script>
</dom-module>
chrome/browser/resources/settings/appearance_page/appearance_fonts_page.js
View file @ c5db0b25
...@@ -2,7 +2,21 @@ ...@@ -2,7 +2,21 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
(function() { import 'chrome://resources/cr_elements/shared_style_css.m.js';
import 'chrome://resources/polymer/v3_0/iron-flex-layout/iron-flex-layout-classes.js';
import '../controls/settings_slider.m.js';
import '../settings_shared_css.m.js';
import {SliderTick} from 'chrome://resources/cr_elements/cr_slider/cr_slider.m.js';
import {I18nBehavior} from 'chrome://resources/js/i18n_behavior.m.js';
import {WebUIListenerBehavior} from 'chrome://resources/js/web_ui_listener_behavior.m.js';
import {html, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
import {DropdownMenuOptionList} from '../controls/settings_dropdown_menu.m.js';
import {loadTimeData} from '../i18n_setup.m.js';
import {FontsBrowserProxy, FontsBrowserProxyImpl, FontsData} from './fonts_browser_proxy.m.js';
/** @type {!Array<number>} */ /** @type {!Array<number>} */
const FONT_SIZE_RANGE = [ const FONT_SIZE_RANGE = [
...@@ -16,7 +30,7 @@ const MINIMUM_FONT_SIZE_RANGE = ...@@ -16,7 +30,7 @@ const MINIMUM_FONT_SIZE_RANGE =
/** /**
* @param {!Array<number>} ticks * @param {!Array<number>} ticks
* @return {!Array<!cr_slider.SliderTick>} * @return {!Array<!SliderTick>}
*/ */
function ticksWithLabels(ticks) { function ticksWithLabels(ticks) {
return ticks.map(x => ({label: `${x}`, value: x})); return ticks.map(x => ({label: `${x}`, value: x}));
...@@ -29,6 +43,8 @@ function ticksWithLabels(ticks) { ...@@ -29,6 +43,8 @@ function ticksWithLabels(ticks) {
Polymer({ Polymer({
is: 'settings-appearance-fonts-page', is: 'settings-appearance-fonts-page',
_template: html`{__html_template__}`,
behaviors: [I18nBehavior, WebUIListenerBehavior], behaviors: [I18nBehavior, WebUIListenerBehavior],
properties: { properties: {
...@@ -37,7 +53,7 @@ Polymer({ ...@@ -37,7 +53,7 @@ Polymer({
/** /**
* Common font sizes. * Common font sizes.
* @private {!Array<!cr_slider.SliderTick>} * @private {!Array<!SliderTick>}
*/ */
fontSizeRange_: { fontSizeRange_: {
readOnly: true, readOnly: true,
...@@ -47,7 +63,7 @@ Polymer({ ...@@ -47,7 +63,7 @@ Polymer({
/** /**
* Reasonable, minimum font sizes. * Reasonable, minimum font sizes.
* @private {!Array<!cr_slider.SliderTick>} * @private {!Array<!SliderTick>}
*/ */
minimumFontSizeRange_: { minimumFontSizeRange_: {
readOnly: true, readOnly: true,
...@@ -68,12 +84,12 @@ Polymer({ ...@@ -68,12 +84,12 @@ Polymer({
'onMinimumSizeChange_(prefs.webkit.webprefs.minimum_font_size.value)', 'onMinimumSizeChange_(prefs.webkit.webprefs.minimum_font_size.value)',
], ],
/** @private {?settings.FontsBrowserProxy} */ /** @private {?FontsBrowserProxy} */
browserProxy_: null, browserProxy_: null,
/** @override */ /** @override */
created() { created() {
this.browserProxy_ = settings.FontsBrowserProxyImpl.getInstance(); this.browserProxy_ = FontsBrowserProxyImpl.getInstance();
}, },
/** @override */ /** @override */
...@@ -109,4 +125,3 @@ Polymer({ ...@@ -109,4 +125,3 @@ Polymer({
this.$.minimumSizeSample.hidden = this.computeMinimumFontSize_() <= 0; this.$.minimumSizeSample.hidden = this.computeMinimumFontSize_() <= 0;
}, },
}); });
})();
chrome/browser/resources/settings/appearance_page/appearance_page.html
View file @ c5db0b25
<link rel="import" href="chrome://resources/html/polymer.html">
<link rel="import" href="chrome://resources/cr_elements/cr_button/cr_button.html">
<link rel="import" href="chrome://resources/cr_elements/cr_link_row/cr_link_row.html">
<link rel="import" href="chrome://resources/cr_elements/shared_style_css.html">
<link rel="import" href="chrome://resources/html/assert.html">
<link rel="import" href="chrome://resources/html/i18n_behavior.html">
<link rel="import" href="chrome://resources/cr_elements/md_select_css.html">
<link rel="import" href="appearance_browser_proxy.html">
<link rel="import" href="../controls/controlled_radio_button.html">
<link rel="import" href="../controls/extension_controlled_indicator.html">
<link rel="import" href="../controls/settings_dropdown_menu.html">
<link rel="import" href="../controls/settings_radio_group.html">
<link rel="import" href="../controls/settings_toggle_button.html">
<link rel="import" href="../i18n_setup.html">
<link rel="import" href="../page_visibility.html">
<link rel="import" href="../route.html">
<link rel="import" href="../router.html">
<link rel="import" href="../settings_page/settings_animated_pages.html">
<link rel="import" href="../settings_page/settings_subpage.html">
<link rel="import" href="../settings_shared_css.html">
<link rel="import" href="../settings_vars_css.html">
<link rel="import" href="home_url_input.html">
<dom-module id="settings-appearance-page">
<template>
<style include="cr-shared-style settings-shared md-select iron-flex"> <style include="cr-shared-style settings-shared md-select iron-flex">
/* Lines up with cr-input. */ /* Lines up with cr-input. */
#custom-input { #custom-input {
...@@ -188,6 +162,3 @@ ...@@ -188,6 +162,3 @@
</settings-subpage> </settings-subpage>
</template> </template>
</settings-animated-pages> </settings-animated-pages>
</template>
<script src="appearance_page.js"></script>
</dom-module>
chrome/browser/resources/settings/appearance_page/appearance_page.js
View file @ c5db0b25
...@@ -2,7 +2,32 @@ ...@@ -2,7 +2,32 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
(function() { import 'chrome://resources/cr_elements/cr_button/cr_button.m.js';
import 'chrome://resources/cr_elements/cr_link_row/cr_link_row.m.js';
import 'chrome://resources/cr_elements/shared_style_css.m.js';
import 'chrome://resources/cr_elements/md_select_css.m.js';
import '../controls/controlled_radio_button.m.js';
import '../controls/extension_controlled_indicator.m.js';
import '../controls/settings_radio_group.m.js';
import '../controls/settings_toggle_button.m.js';
import '../settings_page/settings_animated_pages.m.js';
import '../settings_page/settings_subpage.m.js';
import '../settings_shared_css.m.js';
import '../settings_vars_css.m.js';
import './home_url_input.js';
import {assert} from 'chrome://resources/js/assert.m.js';
import {I18nBehavior} from 'chrome://resources/js/i18n_behavior.m.js';
import {html, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
import {DropdownMenuOptionList} from '../controls/settings_dropdown_menu.m.js';
import {loadTimeData} from '../i18n_setup.m.js';
import {AppearancePageVisibility} from '../page_visibility.m.js';
import {routes} from '../route.m.js';
import {Router} from '../router.m.js';
import {AppearanceBrowserProxy, AppearanceBrowserProxyImpl} from './appearance_browser_proxy.js';
/** /**
* This is the absolute difference maintained between standard and * This is the absolute difference maintained between standard and
...@@ -24,6 +49,8 @@ const AUTOGENERATED_THEME_ID = 'autogenerated_theme_id'; ...@@ -24,6 +49,8 @@ const AUTOGENERATED_THEME_ID = 'autogenerated_theme_id';
Polymer({ Polymer({
is: 'settings-appearance-page', is: 'settings-appearance-page',
_template: html`{__html_template__}`,
behaviors: [I18nBehavior], behaviors: [I18nBehavior],
properties: { properties: {
...@@ -87,9 +114,8 @@ Polymer({ ...@@ -87,9 +114,8 @@ Polymer({
type: Object, type: Object,
value() { value() {
const map = new Map(); const map = new Map();
if (settings.routes.FONTS) { if (routes.FONTS) {
map.set( map.set(routes.FONTS.path, '#customize-fonts-subpage-trigger');
settings.routes.FONTS.path, '#customize-fonts-subpage-trigger');
} }
return map; return map;
}, },
...@@ -104,7 +130,7 @@ Polymer({ ...@@ -104,7 +130,7 @@ Polymer({
}, },
}, },
/** @private {?settings.AppearanceBrowserProxy} */ /** @private {?AppearanceBrowserProxy} */
appearanceBrowserProxy_: null, appearanceBrowserProxy_: null,
observers: [ observers: [
...@@ -119,8 +145,7 @@ Polymer({ ...@@ -119,8 +145,7 @@ Polymer({
/** @override */ /** @override */
created() { created() {
this.appearanceBrowserProxy_ = this.appearanceBrowserProxy_ = AppearanceBrowserProxyImpl.getInstance();
settings.AppearanceBrowserProxyImpl.getInstance();
}, },
/** @override */ /** @override */
...@@ -164,7 +189,7 @@ Polymer({ ...@@ -164,7 +189,7 @@ Polymer({
/** @private */ /** @private */
onCustomizeFontsTap_() { onCustomizeFontsTap_() {
settings.Router.getInstance().navigateTo(settings.routes.FONTS); Router.getInstance().navigateTo(routes.FONTS);
}, },
/** @private */ /** @private */
...@@ -299,4 +324,3 @@ Polymer({ ...@@ -299,4 +324,3 @@ Polymer({
return Math.abs(zoom1 - zoom2) <= 0.001; return Math.abs(zoom1 - zoom2) <= 0.001;
}, },
}); });
})();
chrome/browser/resources/settings/appearance_page/home_url_input.html
View file @ c5db0b25
<link rel="import" href="chrome://resources/html/polymer.html">
<link rel="import" href="chrome://resources/cr_elements/cr_input/cr_input.html">
<link rel="import" href="chrome://resources/html/assert.html">
<link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_behavior.html">
<link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_indicator.html">
<link rel="import" href="../controls/pref_control_behavior.html">
<link rel="import" href="appearance_browser_proxy.html">
<dom-module id="home-url-input">
<template>
<style> <style>
:host { :host {
cursor: auto; cursor: auto;
...@@ -39,6 +28,3 @@ ...@@ -39,6 +28,3 @@
</cr-policy-pref-indicator> </cr-policy-pref-indicator>
</template> </template>
</cr-input> </cr-input>
</template>
<script src="home_url_input.js"></script>
</dom-module>
chrome/browser/resources/settings/appearance_page/home_url_input.js
View file @ c5db0b25
...@@ -7,9 +7,22 @@ ...@@ -7,9 +7,22 @@
* `home-url-input` is a single-line text field intending to be used with * `home-url-input` is a single-line text field intending to be used with
* prefs.homepage * prefs.homepage
*/ */
import 'chrome://resources/cr_elements/cr_input/cr_input.m.js';
import 'chrome://resources/cr_elements/policy/cr_policy_pref_indicator.m.js';
import {CrPolicyPrefBehavior} from 'chrome://resources/cr_elements/policy/cr_policy_pref_behavior.m.js';
import {assert} from 'chrome://resources/js/assert.m.js';
import {html, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
import {PrefControlBehavior} from '../controls/pref_control_behavior.m.js';
import {AppearanceBrowserProxy, AppearanceBrowserProxyImpl} from './appearance_browser_proxy.js';
Polymer({ Polymer({
is: 'home-url-input', is: 'home-url-input',
_template: html`{__html_template__}`,
behaviors: [CrPolicyPrefBehavior, PrefControlBehavior], behaviors: [CrPolicyPrefBehavior, PrefControlBehavior],
properties: { properties: {
...@@ -35,12 +48,12 @@ Polymer({ ...@@ -35,12 +48,12 @@ Polymer({
}, },
}, },
/** @private {?settings.AppearanceBrowserProxy} */ /** @private {?AppearanceBrowserProxy} */
browserProxy_: null, browserProxy_: null,
/** @override */ /** @override */
created() { created() {
this.browserProxy_ = settings.AppearanceBrowserProxyImpl.getInstance(); this.browserProxy_ = AppearanceBrowserProxyImpl.getInstance();
this.noExtensionIndicator = true; // Prevent double indicator. this.noExtensionIndicator = true; // Prevent double indicator.
}, },
......
chrome/browser/resources/settings/lazy_load.js
View file @ c5db0b25
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
// found in the LICENSE file. // found in the LICENSE file.
// Subpages // Subpages
import './appearance_page/appearance_fonts_page.m.js'; import './appearance_page/appearance_fonts_page.js';
import './autofill_page/password_check.m.js'; import './autofill_page/password_check.m.js';
import './autofill_page/passwords_section.m.js'; import './autofill_page/passwords_section.m.js';
import './autofill_page/payments_section.m.js'; import './autofill_page/payments_section.m.js';
......
chrome/browser/resources/settings/settings.gni
View file @ c5db0b25
...@@ -145,6 +145,7 @@ settings_closure_flags = ...@@ -145,6 +145,7 @@ settings_closure_flags =
] ]
settings_migrated_imports = [ settings_migrated_imports = [
"chrome/browser/resources/settings/appearance_page/appearance_page.html",
"chrome/browser/resources/settings/on_startup_page/on_startup_page.html", "chrome/browser/resources/settings/on_startup_page/on_startup_page.html",
"chrome/browser/resources/settings/reset_page/reset_profile_banner.html", "chrome/browser/resources/settings/reset_page/reset_profile_banner.html",
"chrome/browser/resources/settings/search_page/search_page.html", "chrome/browser/resources/settings/search_page/search_page.html",
......
chrome/browser/resources/settings/settings.js
View file @ c5db0b25
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
import './settings_ui/settings_ui.m.js'; import './settings_ui/settings_ui.m.js';
export {AboutPageBrowserProxy, AboutPageBrowserProxyImpl, UpdateStatus} from './about_page/about_page_browser_proxy.m.js'; export {AboutPageBrowserProxy, AboutPageBrowserProxyImpl, UpdateStatus} from './about_page/about_page_browser_proxy.m.js';
export {AppearanceBrowserProxy, AppearanceBrowserProxyImpl} from './appearance_page/appearance_browser_proxy.m.js'; export {AppearanceBrowserProxy, AppearanceBrowserProxyImpl} from './appearance_page/appearance_browser_proxy.js';
export {PasswordManagerImpl, PasswordManagerProxy} from './autofill_page/password_manager_proxy.m.js'; export {PasswordManagerImpl, PasswordManagerProxy} from './autofill_page/password_manager_proxy.m.js';
// <if expr="not chromeos"> // <if expr="not chromeos">
export {DefaultBrowserBrowserProxyImpl} from './default_browser_page/default_browser_browser_proxy.m.js'; export {DefaultBrowserBrowserProxyImpl} from './default_browser_page/default_browser_browser_proxy.m.js';
......
chrome/browser/resources/settings/settings_resources_v3.grdp
View file @ c5db0b25
...@@ -27,17 +27,16 @@ ...@@ -27,17 +27,16 @@
use_base_dir="false" use_base_dir="false"
compress="false" type="BINDATA" compress="false" type="BINDATA"
preprocess="true" /> preprocess="true" />
<include name="IDR_SETTINGS_APPEARANCE_PAGE_APPEARANCE_BROWSER_PROXY_M_JS" <include name="IDR_SETTINGS_APPEARANCE_PAGE_APPEARANCE_BROWSER_PROXY_JS"
file="${root_gen_dir}/chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.m.js" file="appearance_page/appearance_browser_proxy.js"
use_base_dir="false"
preprocess="true" preprocess="true"
compress="false" type="BINDATA" /> compress="false" type="BINDATA" />
<include name="IDR_SETTINGS_APPEARANCE_PAGE_APPEARANCE_FONTS_PAGE_M_JS" <include name="IDR_SETTINGS_APPEARANCE_PAGE_APPEARANCE_FONTS_PAGE_JS"
file="${root_gen_dir}/chrome/browser/resources/settings/appearance_page/appearance_fonts_page.m.js" file="${root_gen_dir}/chrome/browser/resources/settings/appearance_page/appearance_fonts_page.js"
use_base_dir="false" use_base_dir="false"
compress="false" type="BINDATA" /> compress="false" type="BINDATA" />
<include name="IDR_SETTINGS_APPEARANCE_PAGE_APPEARANCE_PAGE_M_JS" <include name="IDR_SETTINGS_APPEARANCE_PAGE_APPEARANCE_PAGE_JS"
file="${root_gen_dir}/chrome/browser/resources/settings/appearance_page/appearance_page.m.js" file="${root_gen_dir}/chrome/browser/resources/settings/appearance_page/appearance_page.js"
use_base_dir="false" use_base_dir="false"
preprocess="true" preprocess="true"
compress="false" type="BINDATA" /> compress="false" type="BINDATA" />
...@@ -45,8 +44,8 @@ ...@@ -45,8 +44,8 @@
file="${root_gen_dir}/chrome/browser/resources/settings/appearance_page/fonts_browser_proxy.m.js" file="${root_gen_dir}/chrome/browser/resources/settings/appearance_page/fonts_browser_proxy.m.js"
use_base_dir="false" use_base_dir="false"
compress="false" type="BINDATA" /> compress="false" type="BINDATA" />
<include name="IDR_SETTINGS_APPEARANCE_PAGE_HOME_URL_INPUT_M_JS" <include name="IDR_SETTINGS_APPEARANCE_PAGE_HOME_URL_INPUT_JS"
file="${root_gen_dir}/chrome/browser/resources/settings/appearance_page/home_url_input.m.js" file="${root_gen_dir}/chrome/browser/resources/settings/appearance_page/home_url_input.js"
use_base_dir="false" use_base_dir="false"
compress="false" type="BINDATA" /> compress="false" type="BINDATA" />
<include name="IDR_SETTINGS_AUTOFILL_PAGE_AUTOFILL_PAGE_M_JS" <include name="IDR_SETTINGS_AUTOFILL_PAGE_AUTOFILL_PAGE_M_JS"
......
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