Chromium Code Reviews| 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_checkbox.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"> |
| (...skipping 10 matching lines...) Expand all Loading... | |
| 21 <style include="settings-shared md-select"> | 21 <style include="settings-shared md-select"> |
| 22 #search-wrapper { | 22 #search-wrapper { |
| 23 align-items: center; | 23 align-items: center; |
| 24 display: flex; | 24 display: flex; |
| 25 min-height: var(--settings-box-min-height); | 25 min-height: var(--settings-box-min-height); |
| 26 } | 26 } |
| 27 | 27 |
| 28 iron-icon { | 28 iron-icon { |
| 29 -webkit-padding-end: 16px; | 29 -webkit-padding-end: 16px; |
| 30 } | 30 } |
| 31 | 31 |
| 32 .indented { | 32 .indented { |
| 33 -webkit-margin-start: 36px; | 33 -webkit-margin-start: 36px; |
| 34 } | 34 } |
| 35 </style> | 35 </style> |
| 36 <settings-animated-pages id="pages" section="search"> | 36 <settings-animated-pages id="pages" section="search"> |
| 37 <neon-animatable route-path="default"> | 37 <neon-animatable route-path="default"> |
| 38 <!-- Omnibox search engine --> | 38 <!-- Omnibox search engine --> |
| 39 <div class="settings-box first block"> | 39 <div class="settings-box first block"> |
| 40 <div id="search-wrapper"> | 40 <div id="search-wrapper"> |
| 41 <p class="start">$i18n{searchExplanation}</p> | 41 <p class="start">$i18n{searchExplanation}</p> |
| (...skipping 15 matching lines...) Expand all Loading... | |
| 57 prefs.default_search_provider.enabled.extensionId]]" | 57 prefs.default_search_provider.enabled.extensionId]]" |
| 58 extension-name="[[ | 58 extension-name="[[ |
| 59 prefs.default_search_provider.enabled.controlledByName]]" | 59 prefs.default_search_provider.enabled.controlledByName]]" |
| 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_]]"> | |
| 68 <!-- Google Now cards in the launcher --> | |
| 69 <div class="settings-box continuation"> | |
| 70 <settings-checkbox id="googleNowEnable" | |
| 71 label="$i18n{searchEnableGoogleNowLabel}" | |
| 72 pref="{{prefs.google_now_launcher.enabled}}"> | |
| 73 </settings-checkbox> | |
| 74 </div> | |
| 75 </template> | |
| 76 | |
| 67 <template is="dom-if" if="[[hotwordInfo_.allowed]]"> | 77 <template is="dom-if" if="[[hotwordInfo_.allowed]]"> |
| 68 <!-- Hotword (OK Google) --> | 78 <!-- Hotword (OK Google) --> |
| 69 <div class="settings-box two-line"> | 79 <div class="settings-box two-line continuation"> |
|
fukino
2016/12/14 16:37:36
Though this line's change is not a part of Google
stevenjb
2016/12/14 18:16:06
Acknowledged.
| |
| 70 <settings-checkbox id="hotwordSearchEnable" class="start" | 80 <settings-checkbox id="hotwordSearchEnable" class="start" |
| 71 label="$i18n{searchOkGoogleLabel}" | 81 label="$i18n{searchOkGoogleLabel}" |
| 72 sub-label="[[getHotwordSearchEnableSubLabel_( | 82 sub-label="[[getHotwordSearchEnableSubLabel_( |
| 73 hotwordInfo_.alwaysOn)]]" | 83 hotwordInfo_.alwaysOn)]]" |
| 74 pref="{{hotwordSearchEnablePref_}}" | 84 pref="{{hotwordSearchEnablePref_}}" |
| 75 on-change="onHotwordSearchEnableChange_"> | 85 on-change="onHotwordSearchEnableChange_"> |
| 76 <a href="$i18nRaw{hotwordLearnMoreUrl}" target="_blank" | 86 <a href="$i18nRaw{hotwordLearnMoreUrl}" target="_blank" |
| 77 on-tap="doNothing_"> | 87 on-tap="doNothing_"> |
| 78 $i18n{searchOkGoogleLearnMore} | 88 $i18n{searchOkGoogleLearnMore} |
| 79 </a> | 89 </a> |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 129 <settings-subpage | 139 <settings-subpage |
| 130 associated-control="[[$$('#subpage-trigger')]]" | 140 associated-control="[[$$('#subpage-trigger')]]" |
| 131 page-title="$i18n{searchEnginesManage}"> | 141 page-title="$i18n{searchEnginesManage}"> |
| 132 <settings-search-engines-page></settings-search-engines-page> | 142 <settings-search-engines-page></settings-search-engines-page> |
| 133 </settings-subpage> | 143 </settings-subpage> |
| 134 </template> | 144 </template> |
| 135 </settings-animated-pages> | 145 </settings-animated-pages> |
| 136 </template> | 146 </template> |
| 137 <script src="search_page.js"></script> | 147 <script src="search_page.js"></script> |
| 138 </dom-module> | 148 </dom-module> |
| OLD | NEW |