| OLD | NEW |
| 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_checkbox.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"> |
| 12 <link rel="import" href="/search_engines_page/search_engines_page.html"> | 12 <link rel="import" href="/search_engines_page/search_engines_page.html"> |
| 13 <link rel="import" href="/search_engines_page/search_engines_browser_proxy.html"
> | 13 <link rel="import" href="/search_engines_page/search_engines_browser_proxy.html"
> |
| 14 <link rel="import" href="/settings_page/settings_animated_pages.html"> | 14 <link rel="import" href="/settings_page/settings_animated_pages.html"> |
| 15 <link rel="import" href="/settings_page/settings_subpage.html"> | 15 <link rel="import" href="/settings_page/settings_subpage.html"> |
| 16 <link rel="import" href="/settings_shared_css.html"> | 16 <link rel="import" href="/settings_shared_css.html"> |
| 17 <link rel="import" href="/settings_vars_css.html"> | 17 <link rel="import" href="/settings_vars_css.html"> |
| 18 | 18 |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 extension-can-be-disabled="[[ | 60 extension-can-be-disabled="[[ |
| 61 prefs.default_search_provider.enabled.extensionCanBeDisabled
]]" | 61 prefs.default_search_provider.enabled.extensionCanBeDisabled
]]" |
| 62 on-disable-extension="onDisableExtension_"> | 62 on-disable-extension="onDisableExtension_"> |
| 63 </extension-controlled-indicator> | 63 </extension-controlled-indicator> |
| 64 </template> | 64 </template> |
| 65 </div> | 65 </div> |
| 66 | 66 |
| 67 <template is="dom-if" if="[[googleNowAvailable_]]"> | 67 <template is="dom-if" if="[[googleNowAvailable_]]"> |
| 68 <!-- Google Now cards in the launcher --> | 68 <!-- Google Now cards in the launcher --> |
| 69 <div class="settings-box continuation"> | 69 <div class="settings-box continuation"> |
| 70 <settings-checkbox id="googleNowEnable" | 70 <settings-toggle-button id="googleNowEnable" class="start" |
| 71 label="$i18n{searchEnableGoogleNowLabel}" | 71 pref="{{prefs.google_now_launcher.enabled}}" |
| 72 pref="{{prefs.google_now_launcher.enabled}}"> | 72 label="$i18n{searchEnableGoogleNowLabel}"> |
| 73 </settings-checkbox> | 73 </settings-toggle-button> |
| 74 </div> | 74 </div> |
| 75 </template> | 75 </template> |
| 76 | 76 |
| 77 <template is="dom-if" if="[[hotwordInfo_.allowed]]"> | 77 <template is="dom-if" if="[[hotwordInfo_.allowed]]"> |
| 78 <!-- Hotword (OK Google) --> | 78 <!-- Hotword (OK Google) --> |
| 79 <div class="settings-box two-line continuation"> | 79 <div class="settings-box two-line continuation"> |
| 80 <settings-checkbox id="hotwordSearchEnable" class="start" | 80 <settings-toggle-button id="hotwordSearchEnable" class="start" |
| 81 pref="{{hotwordSearchEnablePref_}}" |
| 81 label="$i18n{searchOkGoogleLabel}" | 82 label="$i18n{searchOkGoogleLabel}" |
| 82 sub-label="[[getHotwordSearchEnableSubLabel_( | 83 sub-label="[[getHotwordSearchEnableSubLabel_( |
| 83 hotwordInfo_.alwaysOn)]]" | 84 hotwordInfo_.alwaysOn)]]" |
| 84 pref="{{hotwordSearchEnablePref_}}" | |
| 85 on-change="onHotwordSearchEnableChange_"> | 85 on-change="onHotwordSearchEnableChange_"> |
| 86 <a href="$i18nRaw{hotwordLearnMoreUrl}" target="_blank" | 86 <a href="$i18nRaw{hotwordLearnMoreUrl}" target="_blank" |
| 87 on-tap="doNothing_"> | 87 on-tap="doNothing_"> |
| 88 $i18n{searchOkGoogleLearnMore} | 88 $i18n{searchOkGoogleLearnMore} |
| 89 </a> | 89 </a> |
| 90 </settings-checkbox> | 90 </settings-toggle-button> |
| 91 <div class="secondary-action" | 91 <div class="secondary-action" |
| 92 hidden$="[[!getShowHotwordSearchRetrain_(hotwordInfo_.*)]]"> | 92 hidden$="[[!getShowHotwordSearchRetrain_(hotwordInfo_.*)]]"> |
| 93 <paper-button on-tap="onRetrainTap_" class="secondary-button"> | 93 <paper-button on-tap="onRetrainTap_" class="secondary-button"> |
| 94 $i18n{searchOkGoogleRetrain} | 94 $i18n{searchOkGoogleRetrain} |
| 95 </paper-button> | 95 </paper-button> |
| 96 </div> | 96 </div> |
| 97 </div> | 97 </div> |
| 98 | 98 |
| 99 <template is="dom-if" | 99 <template is="dom-if" |
| 100 if="[[getShowHotwordError_(hotwordInfo_.*, | 100 if="[[getShowHotwordError_(hotwordInfo_.*, |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 139 <settings-subpage | 139 <settings-subpage |
| 140 associated-control="[[$$('#subpage-trigger')]]" | 140 associated-control="[[$$('#subpage-trigger')]]" |
| 141 page-title="$i18n{searchEnginesManage}"> | 141 page-title="$i18n{searchEnginesManage}"> |
| 142 <settings-search-engines-page></settings-search-engines-page> | 142 <settings-search-engines-page></settings-search-engines-page> |
| 143 </settings-subpage> | 143 </settings-subpage> |
| 144 </template> | 144 </template> |
| 145 </settings-animated-pages> | 145 </settings-animated-pages> |
| 146 </template> | 146 </template> |
| 147 <script src="search_page.js"></script> | 147 <script src="search_page.js"></script> |
| 148 </dom-module> | 148 </dom-module> |
| OLD | NEW |