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

Side by Side 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, 7 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 unified diff | Download patch
OLDNEW
1 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> 1 link rel="import" href="chrome://resources/html/i18n_behavior.html">
2 <link rel="import" href="chrome://resources/html/md_select_css.html"> 2 <link rel="import" href="chrome://resources/html/md_select_css.html">
3 <link rel="import" href="chrome://resources/html/polymer.html"> 3 <link rel="import" href="chrome://resources/html/polymer.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> 4 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html">
7 <link rel="import" href="../controls/extension_controlled_indicator.html"> 7 <link rel="import" href="../controls/extension_controlled_indicator.html">
8 <link rel="import" href="../controls/settings_toggle_button.html"> 8 <link rel="import" href="../controls/settings_toggle_button.html">
9 <link rel="import" href="../icons.html"> 9 <link rel="import" href="../icons.html">
10 <link rel="import" href="../i18n_setup.html"> 10 <link rel="import" href="../i18n_setup.html">
11 <link rel="import" href="../route.html"> 11 <link rel="import" href="../route.html">
(...skipping 23 matching lines...) Expand all
35 </style> 35 </style>
36 <settings-animated-pages id="pages" section="search" 36 <settings-animated-pages id="pages" section="search"
37 focus-config="[[focusConfig_]]"> 37 focus-config="[[focusConfig_]]">
38 <neon-animatable route-path="default"> 38 <neon-animatable route-path="default">
39 <!-- Omnibox search engine --> 39 <!-- Omnibox search engine -->
40 <div class="settings-box first block"> 40 <div class="settings-box first block">
41 <div id="search-wrapper"> 41 <div id="search-wrapper">
42 <p id="searchExplanation" class="start"> 42 <p id="searchExplanation" class="start">
43 $i18nRaw{searchExplanation} 43 $i18nRaw{searchExplanation}
44 </p> 44 </p>
45 <template is="dom-if" if="[[isDefaultSearchControlledByPolicy_(
46 prefs.default_search_provider_data.template_url_data)]]">
47 <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.
48 prefs.default_search_provider_data.template_url_data]]">
49 </cr-policy-pref-indicator>
50 </template>
45 <div> 51 <div>
46 <select class="md-select" on-change="onChange_" 52 <select class="md-select" on-change="onChange_"
47 aria-labelledby="searchExplanation" 53 aria-labelledby="searchExplanation"
48 disabled$="[[ 54 disabled$="[[isDefaultSearchEngineEnforced_(
49 prefs.default_search_provider.enabled.extensionId]]"> 55 prefs.default_search_provider_data.template_url_data)]]">
50 <template is="dom-repeat" items="[[searchEngines_]]"> 56 <template is="dom-repeat" items="[[searchEngines_]]">
51 <option selected="[[item.default]]">[[item.name]]</option> 57 <option selected="[[item.default]]">[[item.name]]</option>
52 </template> 58 </template>
53 </select> 59 </select>
54 <span class="md-select-underline"></span> 60 <span class="md-select-underline"></span>
55 </div> 61 </div>
56 </div> 62 </div>
57 <template is="dom-if" 63 <template is="dom-if"
58 if="[[prefs.default_search_provider.enabled.extensionId]]"> 64 if="[[prefs.default_search_provider_data.template_url_data.extensi onId]]">
59 <extension-controlled-indicator 65 <extension-controlled-indicator
60 extension-id="[[ 66 extension-id="[[
61 prefs.default_search_provider.enabled.extensionId]]" 67 prefs.default_search_provider_data.template_url_data.extensi onId]]"
62 extension-name="[[ 68 extension-name="[[
63 prefs.default_search_provider.enabled.controlledByName]]" 69 prefs.default_search_provider_data.template_url_data.control ledByName]]"
64 extension-can-be-disabled="[[ 70 extension-can-be-disabled="[[
65 prefs.default_search_provider.enabled.extensionCanBeDisabled ]]" 71 prefs.default_search_provider_data.template_url_data.extensi onCanBeDisabled]]"
66 on-disable-extension="onDisableExtension_"> 72 on-disable-extension="onDisableExtension_">
67 </extension-controlled-indicator> 73 </extension-controlled-indicator>
68 </template> 74 </template>
69 </div> 75 </div>
70 76
71 <template is="dom-if" if="[[googleNowAvailable_]]"> 77 <template is="dom-if" if="[[googleNowAvailable_]]">
72 <!-- Google Now cards in the launcher --> 78 <!-- Google Now cards in the launcher -->
73 <div class="settings-box continuation indented"> 79 <div class="settings-box continuation indented">
74 <settings-toggle-button id="googleNowEnable" class="start" 80 <settings-toggle-button id="googleNowEnable" class="start"
75 pref="{{prefs.google_now_launcher.enabled}}" 81 pref="{{prefs.google_now_launcher.enabled}}"
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 <settings-subpage 145 <settings-subpage
140 associated-control="[[$$('#subpage-trigger')]]" 146 associated-control="[[$$('#subpage-trigger')]]"
141 page-title="$i18n{searchEnginesManage}"> 147 page-title="$i18n{searchEnginesManage}">
142 <settings-search-engines-page></settings-search-engines-page> 148 <settings-search-engines-page></settings-search-engines-page>
143 </settings-subpage> 149 </settings-subpage>
144 </template> 150 </template>
145 </settings-animated-pages> 151 </settings-animated-pages>
146 </template> 152 </template>
147 <script src="search_page.js"></script> 153 <script src="search_page.js"></script>
148 </dom-module> 154 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698