| OLD | NEW |
| 1 <link rel="import" href="chrome://resources/html/md_select_css.html"> | 1 <link rel="import" href="chrome://resources/html/md_select_css.html"> |
| 2 <link rel="import" href="chrome://resources/html/polymer.html"> | 2 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 3 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
matable.html"> | 3 <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/paper-icon-button/paper
-icon-button-light.html"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button-light.html"> |
| 5 <link rel="import" href="/controls/extension_controlled_indicator.html"> |
| 5 <link rel="import" href="/route.html"> | 6 <link rel="import" href="/route.html"> |
| 6 <link rel="import" href="/search_engines_page/search_engines_page.html"> | 7 <link rel="import" href="/search_engines_page/search_engines_page.html"> |
| 7 <link rel="import" href="/search_engines_page/search_engines_browser_proxy.html"
> | 8 <link rel="import" href="/search_engines_page/search_engines_browser_proxy.html"
> |
| 8 <link rel="import" href="/settings_page/settings_animated_pages.html"> | 9 <link rel="import" href="/settings_page/settings_animated_pages.html"> |
| 9 <link rel="import" href="/settings_page/settings_subpage.html"> | 10 <link rel="import" href="/settings_page/settings_subpage.html"> |
| 10 <link rel="import" href="/settings_shared_css.html"> | 11 <link rel="import" href="/settings_shared_css.html"> |
| 11 <link rel="import" href="/settings_vars_css.html"> | 12 <link rel="import" href="/settings_vars_css.html"> |
| 12 | 13 |
| 13 <dom-module id="settings-search-page"> | 14 <dom-module id="settings-search-page"> |
| 14 <template> | 15 <template> |
| 15 <style include="settings-shared md-select"></style> | 16 <style include="settings-shared md-select"> |
| 17 #search-wrapper { |
| 18 align-items: center; |
| 19 display: flex; |
| 20 min-height: var(--settings-box-min-height); |
| 21 } |
| 22 </style> |
| 16 <settings-animated-pages id="pages" section="search"> | 23 <settings-animated-pages id="pages" section="search"> |
| 17 <neon-animatable route-path="default"> | 24 <neon-animatable route-path="default"> |
| 18 <div class="settings-box first"> | 25 <div class="settings-box first block"> |
| 19 <p class="start">$i18n{searchExplanation}</p> | 26 <div id="search-wrapper"> |
| 20 <div> | 27 <p class="start">$i18n{searchExplanation}</p> |
| 21 <select class="md-select" on-change="onChange_"> | 28 <div> |
| 22 <template is="dom-repeat" items="[[searchEngines_]]"> | 29 <select class="md-select" on-change="onChange_" |
| 23 <option selected$="[[item.default]]">[[item.name]]</option> | 30 disabled$="[[ |
| 24 </template> | 31 prefs.default_search_provider.enabled.extensionId]]"> |
| 25 </select> | 32 <template is="dom-repeat" items="[[searchEngines_]]"> |
| 26 <span class="md-select-underline"></span> | 33 <option selected$="[[item.default]]">[[item.name]]</option> |
| 34 </template> |
| 35 </select> |
| 36 <span class="md-select-underline"></span> |
| 37 </div> |
| 27 </div> | 38 </div> |
| 39 <template is="dom-if" |
| 40 if="[[prefs.default_search_provider.enabled.extensionId]]"> |
| 41 <extension-controlled-indicator |
| 42 extension-id="[[ |
| 43 prefs.default_search_provider.enabled.extensionId]]" |
| 44 extension-name="[[ |
| 45 prefs.default_search_provider.enabled.controlledByName]]" |
| 46 extension-can-be-disabled="[[ |
| 47 prefs.default_search_provider.enabled.extensionCanBeDisabled
]]" |
| 48 on-disable-extension="onDisableExtension_"> |
| 49 </extension-controlled-indicator> |
| 50 </template> |
| 28 </div> | 51 </div> |
| 29 <div id="subpage-trigger" class="settings-box two-line" | 52 <div id="subpage-trigger" class="settings-box two-line" |
| 30 on-tap="onManageSearchEnginesTap_" actionable> | 53 on-tap="onManageSearchEnginesTap_" actionable> |
| 31 <div class="start"> | 54 <div class="start"> |
| 32 $i18n{searchEnginesManage} | 55 $i18n{searchEnginesManage} |
| 33 <div class="secondary"> | 56 <div class="secondary"> |
| 34 $i18n{searchEnginesManageDescription} | 57 $i18n{searchEnginesManageDescription} |
| 35 </div> | 58 </div> |
| 36 </div> | 59 </div> |
| 37 <button class="subpage-arrow" is="paper-icon-button-light"></button> | 60 <button class="subpage-arrow" is="paper-icon-button-light"></button> |
| 38 </div> | 61 </div> |
| 39 </neon-animatable> | 62 </neon-animatable> |
| 40 <template is="dom-if" route-path="/searchEngines"> | 63 <template is="dom-if" route-path="/searchEngines"> |
| 41 <settings-subpage | 64 <settings-subpage |
| 42 associated-control="[[$$('#subpage-trigger')]]" | 65 associated-control="[[$$('#subpage-trigger')]]" |
| 43 page-title="$i18n{searchEnginesManage}"> | 66 page-title="$i18n{searchEnginesManage}"> |
| 44 <settings-search-engines-page></settings-search-engines-page> | 67 <settings-search-engines-page></settings-search-engines-page> |
| 45 </settings-subpage> | 68 </settings-subpage> |
| 46 </template> | 69 </template> |
| 47 </settings-animated-pages> | 70 </settings-animated-pages> |
| 48 </template> | 71 </template> |
| 49 <script src="search_page.js"></script> | 72 <script src="search_page.js"></script> |
| 50 </dom-module> | 73 </dom-module> |
| OLD | NEW |