Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(433)

Unified Diff: chrome/browser/resources/settings/search_page/search_page.html

Issue 2835933007: MD Settings: show when the default search engine is controlled by policy (Closed)
Patch Set: merge Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/settings/search_page/search_page.html
diff --git a/chrome/browser/resources/settings/search_page/search_page.html b/chrome/browser/resources/settings/search_page/search_page.html
index e87bb580d954c6fce24d4bd35256843ccb52ba46..934f79a22a35498e580d45dd62188718a0f07fa6 100644
--- a/chrome/browser/resources/settings/search_page/search_page.html
+++ b/chrome/browser/resources/settings/search_page/search_page.html
@@ -1,4 +1,4 @@
-<link rel="import" href="chrome://resources/html/i18n_behavior.html">
+link rel="import" href="chrome://resources/html/i18n_behavior.html">
<link rel="import" href="chrome://resources/html/md_select_css.html">
<link rel="import" href="chrome://resources/html/polymer.html">
<link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-animatable.html">
@@ -42,11 +42,17 @@
<p id="searchExplanation" class="start">
$i18nRaw{searchExplanation}
</p>
+ <template is="dom-if" if="[[isDefaultSearchControlledByPolicy_(
+ prefs.default_search_provider_data.template_url_data)]]">
+ <cr-policy-pref-indicator pref="[[
dpapad 2017/04/26 17:27:05 Let's add an HTML import for cr_policy_pref_indica
Dan Beam 2017/04/26 18:39:19 Done.
+ prefs.default_search_provider_data.template_url_data]]">
+ </cr-policy-pref-indicator>
+ </template>
<div>
<select class="md-select" on-change="onChange_"
aria-labelledby="searchExplanation"
- disabled$="[[
- prefs.default_search_provider.enabled.extensionId]]">
+ disabled$="[[isDefaultSearchEngineEnforced_(
+ prefs.default_search_provider_data.template_url_data)]]">
<template is="dom-repeat" items="[[searchEngines_]]">
<option selected="[[item.default]]">[[item.name]]</option>
</template>
@@ -55,14 +61,14 @@
</div>
</div>
<template is="dom-if"
- if="[[prefs.default_search_provider.enabled.extensionId]]">
+ if="[[prefs.default_search_provider_data.template_url_data.extensionId]]">
<extension-controlled-indicator
extension-id="[[
- prefs.default_search_provider.enabled.extensionId]]"
+ prefs.default_search_provider_data.template_url_data.extensionId]]"
extension-name="[[
- prefs.default_search_provider.enabled.controlledByName]]"
+ prefs.default_search_provider_data.template_url_data.controlledByName]]"
extension-can-be-disabled="[[
- prefs.default_search_provider.enabled.extensionCanBeDisabled]]"
+ prefs.default_search_provider_data.template_url_data.extensionCanBeDisabled]]"
on-disable-extension="onDisableExtension_">
</extension-controlled-indicator>
</template>

Powered by Google App Engine
This is Rietveld 408576698