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