| OLD | NEW | 
|---|
| 1 <link rel="import" href="chrome://resources/html/polymer.html"> | 1 <link rel="import" href="chrome://resources/html/polymer.html"> | 
| 2 | 2 | 
| 3 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_in
     dicator.html"> | 3 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_in
     dicator.html"> | 
| 4 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 4 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 
| 5 <link rel="import" href="chrome://resources/html/md_select_css.html"> | 5 <link rel="import" href="chrome://resources/html/md_select_css.html"> | 
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
     matable.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
     matable.html"> | 
| 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
     on.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
     on.html"> | 
| 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
     -icon-button-light.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
     -icon-button-light.html"> | 
| 9 <link rel="import" href="../controls/extension_controlled_indicator.html"> | 9 <link rel="import" href="../controls/extension_controlled_indicator.html"> | 
| 10 <link rel="import" href="../controls/settings_toggle_button.html"> | 10 <link rel="import" href="../controls/settings_toggle_button.html"> | 
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 92             <settings-toggle-button id="hotwordSearchEnable" class="start" | 92             <settings-toggle-button id="hotwordSearchEnable" class="start" | 
| 93                 pref="{{hotwordSearchEnablePref_}}" | 93                 pref="{{hotwordSearchEnablePref_}}" | 
| 94                 label="$i18n{searchOkGoogleLabel}" | 94                 label="$i18n{searchOkGoogleLabel}" | 
| 95                 sub-label="[[getHotwordSearchEnableSubLabel_( | 95                 sub-label="[[getHotwordSearchEnableSubLabel_( | 
| 96                            hotwordInfo_.alwaysOn)]]" | 96                            hotwordInfo_.alwaysOn)]]" | 
| 97                 on-change="onHotwordSearchEnableChange_"> | 97                 on-change="onHotwordSearchEnableChange_"> | 
| 98             </settings-toggle-button> | 98             </settings-toggle-button> | 
| 99             <div class="settings-row" | 99             <div class="settings-row" | 
| 100                 hidden$="[[!getShowHotwordSearchRetrain_(hotwordInfo_.*)]]"> | 100                 hidden$="[[!getShowHotwordSearchRetrain_(hotwordInfo_.*)]]"> | 
| 101               <div class="separator"></div> | 101               <div class="separator"></div> | 
| 102               <paper-button on-tap="onRetrainTap_" class="secondary-button"> | 102               <paper-button on-tap="onRetrainTap_"> | 
| 103                 $i18n{searchOkGoogleRetrain} | 103                 $i18n{searchOkGoogleRetrain} | 
| 104               </paper-button> | 104               </paper-button> | 
| 105             </div> | 105             </div> | 
| 106           </div> | 106           </div> | 
| 107 | 107 | 
| 108           <template is="dom-if" | 108           <template is="dom-if" | 
| 109               if="[[getShowHotwordError_(hotwordInfo_.*, | 109               if="[[getShowHotwordError_(hotwordInfo_.*, | 
| 110                   hotwordSearchEnablePref_)]]"> | 110                   hotwordSearchEnablePref_)]]"> | 
| 111             <div class="settings-box continuation indented"> | 111             <div class="settings-box continuation indented"> | 
| 112               <iron-icon icon="settings:warning"></iron-icon> | 112               <iron-icon icon="settings:warning"></iron-icon> | 
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 148         <settings-subpage | 148         <settings-subpage | 
| 149             associated-control="[[$$('#subpage-trigger')]]" | 149             associated-control="[[$$('#subpage-trigger')]]" | 
| 150             page-title="$i18n{searchEnginesManage}"> | 150             page-title="$i18n{searchEnginesManage}"> | 
| 151           <settings-search-engines-page></settings-search-engines-page> | 151           <settings-search-engines-page></settings-search-engines-page> | 
| 152         </settings-subpage> | 152         </settings-subpage> | 
| 153       </template> | 153       </template> | 
| 154     </settings-animated-pages> | 154     </settings-animated-pages> | 
| 155   </template> | 155   </template> | 
| 156   <script src="search_page.js"></script> | 156   <script src="search_page.js"></script> | 
| 157 </dom-module> | 157 </dom-module> | 
| OLD | NEW | 
|---|