Skip to content

GitLab

T
tangled
Commit ea40e729 authored by dpapad's avatar dpapad Committed by Commit Bot
Browse files
Options

Settings: Check-in search_page/ Polymer3. 

Bug: 1069258
Change-Id: If45a412efd3194aef806e2e3084cd0bc31667bb6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2152995
Commit-Queue: dpapad <dpapad@chromium.org>
Reviewed-by: default avatarJohn Lee <johntlee@chromium.org>
Cr-Commit-Position: refs/heads/master@{#759883}
parent d04545c8
Hide whitespace changes
Inline Side-by-side
Showing with 91 additions and 115 deletions
chrome/browser/resources/settings/BUILD.gn
View file @ ea40e729
...@@ -81,7 +81,6 @@ group("closure_compile") { ...@@ -81,7 +81,6 @@ group("closure_compile") {
"privacy_page:closure_compile", "privacy_page:closure_compile",
"safety_check_page:closure_compile", "safety_check_page:closure_compile",
"search_engines_page:closure_compile", "search_engines_page:closure_compile",
"search_page:closure_compile",
"settings_main:closure_compile", "settings_main:closure_compile",
"settings_menu:closure_compile", "settings_menu:closure_compile",
"settings_page:closure_compile", "settings_page:closure_compile",
......
chrome/browser/resources/settings/search_page/BUILD.gn
View file @ ea40e729
...@@ -6,28 +6,13 @@ import("//third_party/closure_compiler/compile_js.gni") ...@@ -6,28 +6,13 @@ import("//third_party/closure_compiler/compile_js.gni")
import("//tools/polymer/polymer.gni") import("//tools/polymer/polymer.gni")
import("../settings.gni") import("../settings.gni")
js_type_check("closure_compile") {
deps = [ ":search_page" ]
}
js_library("search_page") {
deps = [
"..:route",
"..:router",
"../prefs",
"../search_engines_page:search_engines_browser_proxy",
"../settings_page:settings_animated_pages",
"//ui/webui/resources/js:cr",
]
}
js_type_check("closure_compile_module") { js_type_check("closure_compile_module") {
is_polymer3 = true is_polymer3 = true
deps = [ ":search_page.m" ] closure_flags = settings_closure_flags
deps = [ ":search_page" ]
} }
js_library("search_page.m") { js_library("search_page") {
sources = [ "$root_gen_dir/chrome/browser/resources/settings/search_page/search_page.m.js" ]
deps = [ deps = [
"..:route.m", "..:route.m",
"..:router.m", "..:router.m",
...@@ -35,7 +20,6 @@ js_library("search_page.m") { ...@@ -35,7 +20,6 @@ js_library("search_page.m") {
"//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
"//ui/webui/resources/js:cr.m", "//ui/webui/resources/js:cr.m",
] ]
extra_deps = [ ":search_page_module" ]
externs_list = [ "$externs_path/settings_private.js" ] externs_list = [ "$externs_path/settings_private.js" ]
} }
...@@ -46,12 +30,5 @@ group("polymer3_elements") { ...@@ -46,12 +30,5 @@ group("polymer3_elements") {
polymer_modulizer("search_page") { polymer_modulizer("search_page") {
js_file = "search_page.js" js_file = "search_page.js"
html_file = "search_page.html" html_file = "search_page.html"
html_type = "dom-module" html_type = "v3-ready"
namespace_rewrites = settings_namespace_rewrites
auto_imports = [
"chrome/browser/resources/settings/route.html|routes",
"chrome/browser/resources/settings/router.html|Router",
"chrome/browser/resources/settings/search_engines_page/search_engines_browser_proxy.html|SearchEnginesBrowserProxyImpl,SearchEnginesBrowserProxy,SearchEngine",
"ui/webui/resources/html/cr.html|addWebUIListener",
]
} }
chrome/browser/resources/settings/search_page/search_page.html
View file @ ea40e729
<link rel="import" href="chrome://resources/html/polymer.html"> <style include="settings-shared md-select">
#search-wrapper {
<link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_indicator.html"> align-items: center;
<link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html"> display: flex;
<link rel="import" href="chrome://resources/cr_elements/md_select_css.html"> min-height: var(--settings-row-min-height);
<link rel="import" href="chrome://resources/html/cr.html"> }
<link rel="import" href="../controls/extension_controlled_indicator.html"> </style>
<link rel="import" href="../i18n_setup.html"> <settings-animated-pages id="pages" section="search"
<link rel="import" href="../route.html"> focus-config="[[focusConfig_]]">
<link rel="import" href="../router.html"> <div route-path="default">
<link rel="import" href="../search_engines_page/search_engines_browser_proxy.html"> <!-- Omnibox search engine -->
<link rel="import" href="../settings_page/settings_animated_pages.html"> <div class="settings-box first block">
<link rel="import" href="../settings_page/settings_subpage.html"> <div id="search-wrapper">
<link rel="import" href="../settings_shared_css.html"> <div id="searchExplanation" class="start settings-box-text">
<link rel="import" href="../settings_vars_css.html"> $i18nRaw{searchExplanation}
</div>
<dom-module id="settings-search-page"> <template is="dom-if" if="[[isDefaultSearchControlledByPolicy_(
<template> prefs.default_search_provider_data.template_url_data)]]">
<style include="settings-shared md-select"> <cr-policy-pref-indicator pref="[[
#search-wrapper { prefs.default_search_provider_data.template_url_data]]">
align-items: center; </cr-policy-pref-indicator>
display: flex; </template>
min-height: var(--settings-row-min-height); <select class="md-select" on-change="onChange_"
} aria-labelledby="searchExplanation"
</style> disabled$="[[isDefaultSearchEngineEnforced_(
<settings-animated-pages id="pages" section="search"
focus-config="[[focusConfig_]]">
<div route-path="default">
<!-- Omnibox search engine -->
<div class="settings-box first block">
<div id="search-wrapper">
<div id="searchExplanation" class="start settings-box-text">
$i18nRaw{searchExplanation}
</div>
<template is="dom-if" if="[[isDefaultSearchControlledByPolicy_(
prefs.default_search_provider_data.template_url_data)]]"> prefs.default_search_provider_data.template_url_data)]]">
<cr-policy-pref-indicator pref="[[ <template is="dom-repeat" items="[[searchEngines_]]">
prefs.default_search_provider_data.template_url_data]]"> <option selected="[[item.default]]">[[item.name]]</option>
</cr-policy-pref-indicator>
</template>
<select class="md-select" on-change="onChange_"
aria-labelledby="searchExplanation"
disabled$="[[isDefaultSearchEngineEnforced_(
prefs.default_search_provider_data.template_url_data)]]">
<template is="dom-repeat" items="[[searchEngines_]]">
<option selected="[[item.default]]">[[item.name]]</option>
</template>
</select>
</div>
<template is="dom-if"
if="[[prefs.default_search_provider_data.template_url_data.extensionId]]">
<extension-controlled-indicator
extension-id="[[
prefs.default_search_provider_data.template_url_data.extensionId]]"
extension-name="[[
prefs.default_search_provider_data.template_url_data.controlledByName]]"
extension-can-be-disabled="[[
prefs.default_search_provider_data.template_url_data.extensionCanBeDisabled]]"
on-disable-extension="onDisableExtension_">
</extension-controlled-indicator>
</template> </template>
</div> </select>
<!-- Manage search engines -->
<cr-link-row class="hr" id="enginesSubpageTrigger"
label="$i18n{searchEnginesManage}"
on-click="onManageSearchEnginesTap_"
role-description="$i18n{subpageArrowRoleDescription}"></cr-link-row>
</div> </div>
<template is="dom-if" route-path="/searchEngines"> <template is="dom-if"
<settings-subpage if="[[prefs.default_search_provider_data.template_url_data.extensionId]]">
associated-control="[[$$('#enginesSubpageTrigger')]]" <extension-controlled-indicator
page-title="$i18n{searchEnginesManage}" extension-id="[[
search-label="$i18n{searchEnginesSearch}" prefs.default_search_provider_data.template_url_data.extensionId]]"
search-term="{{searchEnginesFilter_}}"> extension-name="[[
<settings-search-engines-page filter="[[searchEnginesFilter_]]"> prefs.default_search_provider_data.template_url_data.controlledByName]]"
</settings-subpage> extension-can-be-disabled="[[
prefs.default_search_provider_data.template_url_data.extensionCanBeDisabled]]"
on-disable-extension="onDisableExtension_">
</extension-controlled-indicator>
</template> </template>
</settings-animated-pages> </div>
<!-- Manage search engines -->
<cr-link-row class="hr" id="enginesSubpageTrigger"
label="$i18n{searchEnginesManage}"
on-click="onManageSearchEnginesTap_"
role-description="$i18n{subpageArrowRoleDescription}"></cr-link-row>
</div>
<template is="dom-if" route-path="/searchEngines">
<settings-subpage
associated-control="[[$$('#enginesSubpageTrigger')]]"
page-title="$i18n{searchEnginesManage}"
search-label="$i18n{searchEnginesSearch}"
search-term="{{searchEnginesFilter_}}">
<settings-search-engines-page filter="[[searchEnginesFilter_]]">
</settings-subpage>
</template> </template>
<script src="search_page.js"></script> </settings-animated-pages>
</dom-module>
chrome/browser/resources/settings/search_page/search_page.js
View file @ ea40e729
...@@ -6,9 +6,28 @@ ...@@ -6,9 +6,28 @@
* @fileoverview * @fileoverview
* 'settings-search-page' is the settings page containing search settings. * 'settings-search-page' is the settings page containing search settings.
*/ */
import 'chrome://resources/cr_elements/policy/cr_policy_pref_indicator.m.js';
import 'chrome://resources/cr_elements/shared_vars_css.m.js';
import 'chrome://resources/cr_elements/md_select_css.m.js';
import '../controls/extension_controlled_indicator.m.js';
import '../i18n_setup.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 {addWebUIListener} from 'chrome://resources/js/cr.m.js';
import {html, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
import {routes} from '../route.m.js';
import {Router} from '../router.m.js';
import {SearchEngine, SearchEnginesBrowserProxy, SearchEnginesBrowserProxyImpl} from '../search_engines_page/search_engines_browser_proxy.m.js';
Polymer({ Polymer({
is: 'settings-search-page', is: 'settings-search-page',
_template: html`{__html_template__}`,
properties: { properties: {
prefs: Object, prefs: Object,
...@@ -30,12 +49,12 @@ Polymer({ ...@@ -30,12 +49,12 @@ Polymer({
focusConfig_: Object, focusConfig_: Object,
}, },
/** @private {?settings.SearchEnginesBrowserProxy} */ /** @private {?SearchEnginesBrowserProxy} */
browserProxy_: null, browserProxy_: null,
/** @override */ /** @override */
created() { created() {
this.browserProxy_ = settings.SearchEnginesBrowserProxyImpl.getInstance(); this.browserProxy_ = SearchEnginesBrowserProxyImpl.getInstance();
}, },
/** @override */ /** @override */
...@@ -45,12 +64,12 @@ Polymer({ ...@@ -45,12 +64,12 @@ Polymer({
this.set('searchEngines_', searchEngines.defaults); this.set('searchEngines_', searchEngines.defaults);
}; };
this.browserProxy_.getSearchEnginesList().then(updateSearchEngines); this.browserProxy_.getSearchEnginesList().then(updateSearchEngines);
cr.addWebUIListener('search-engines-changed', updateSearchEngines); addWebUIListener('search-engines-changed', updateSearchEngines);
this.focusConfig_ = new Map(); this.focusConfig_ = new Map();
if (settings.routes.SEARCH_ENGINES) { if (routes.SEARCH_ENGINES) {
this.focusConfig_.set( this.focusConfig_.set(
settings.routes.SEARCH_ENGINES.path, '#enginesSubpageTrigger'); routes.SEARCH_ENGINES.path, '#enginesSubpageTrigger');
} }
}, },
...@@ -68,7 +87,7 @@ Polymer({ ...@@ -68,7 +87,7 @@ Polymer({
/** @private */ /** @private */
onManageSearchEnginesTap_() { onManageSearchEnginesTap_() {
settings.Router.getInstance().navigateTo(settings.routes.SEARCH_ENGINES); Router.getInstance().navigateTo(routes.SEARCH_ENGINES);
}, },
/** /**
......
chrome/browser/resources/settings/settings.gni
View file @ ea40e729
...@@ -144,5 +144,7 @@ settings_closure_flags = ...@@ -144,5 +144,7 @@ settings_closure_flags =
"js_module_root=./gen/chrome/browser/resources/settings/", "js_module_root=./gen/chrome/browser/resources/settings/",
] ]
settings_migrated_imports = settings_migrated_imports = [
[ "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/settings_resources_v3.grdp
View file @ ea40e729
...@@ -599,8 +599,8 @@ ...@@ -599,8 +599,8 @@
file="${root_gen_dir}/chrome/browser/resources/settings/search_engines_page/search_engines_page.m.js" file="${root_gen_dir}/chrome/browser/resources/settings/search_engines_page/search_engines_page.m.js"
use_base_dir="false" use_base_dir="false"
compress="false" type="BINDATA" /> compress="false" type="BINDATA" />
<include name="IDR_SETTINGS_SEARCH_PAGE_M_JS" <include name="IDR_SETTINGS_SEARCH_PAGE_JS"
file="${root_gen_dir}/chrome/browser/resources/settings/search_page/search_page.m.js" file="${root_gen_dir}/chrome/browser/resources/settings/search_page/search_page.js"
use_base_dir="false" use_base_dir="false"
compress="false" type="BINDATA" /> compress="false" type="BINDATA" />
<include name="IDR_SETTINGS_SEARCH_SETTINGS_M_JS" <include name="IDR_SETTINGS_SEARCH_SETTINGS_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