Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(27)

Side by Side Diff: chrome/browser/resources/settings/search_page/search_page.html

Issue 2849663002: [MD settings] replace secondary-action with separator (Closed)
Patch Set: merge with master Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_in dicator.html"> 1 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_in dicator.html">
2 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> 2 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
3 <link rel="import" href="chrome://resources/html/md_select_css.html"> 3 <link rel="import" href="chrome://resources/html/md_select_css.html">
4 <link rel="import" href="chrome://resources/html/polymer.html"> 4 <link rel="import" href="chrome://resources/html/polymer.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/neon-animation/neon-ani matable.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-button/paper-butt on.html">
7 <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">
8 <link rel="import" href="../controls/extension_controlled_indicator.html"> 8 <link rel="import" href="../controls/extension_controlled_indicator.html">
9 <link rel="import" href="../controls/settings_toggle_button.html"> 9 <link rel="import" href="../controls/settings_toggle_button.html">
10 <link rel="import" href="../icons.html"> 10 <link rel="import" href="../icons.html">
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 <template is="dom-if" if="[[hotwordInfo_.allowed]]"> 88 <template is="dom-if" if="[[hotwordInfo_.allowed]]">
89 <!-- Hotword (OK Google) --> 89 <!-- Hotword (OK Google) -->
90 <div class="settings-box two-line continuation indented"> 90 <div class="settings-box two-line continuation indented">
91 <settings-toggle-button id="hotwordSearchEnable" class="start" 91 <settings-toggle-button id="hotwordSearchEnable" class="start"
92 pref="{{hotwordSearchEnablePref_}}" 92 pref="{{hotwordSearchEnablePref_}}"
93 label="$i18n{searchOkGoogleLabel}" 93 label="$i18n{searchOkGoogleLabel}"
94 sub-label="[[getHotwordSearchEnableSubLabel_( 94 sub-label="[[getHotwordSearchEnableSubLabel_(
95 hotwordInfo_.alwaysOn)]]" 95 hotwordInfo_.alwaysOn)]]"
96 on-change="onHotwordSearchEnableChange_"> 96 on-change="onHotwordSearchEnableChange_">
97 </settings-toggle-button> 97 </settings-toggle-button>
98 <div class="secondary-action" 98 <div class="layout horizontal center"
99 hidden$="[[!getShowHotwordSearchRetrain_(hotwordInfo_.*)]]"> 99 hidden$="[[!getShowHotwordSearchRetrain_(hotwordInfo_.*)]]">
100 <div class="separator"></div>
100 <paper-button on-tap="onRetrainTap_" class="secondary-button"> 101 <paper-button on-tap="onRetrainTap_" class="secondary-button">
101 $i18n{searchOkGoogleRetrain} 102 $i18n{searchOkGoogleRetrain}
102 </paper-button> 103 </paper-button>
103 </div> 104 </div>
104 </div> 105 </div>
105 106
106 <template is="dom-if" 107 <template is="dom-if"
107 if="[[getShowHotwordError_(hotwordInfo_.*, 108 if="[[getShowHotwordError_(hotwordInfo_.*,
108 hotwordSearchEnablePref_)]]"> 109 hotwordSearchEnablePref_)]]">
109 <div class="settings-box continuation indented"> 110 <div class="settings-box continuation indented">
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 <settings-subpage 147 <settings-subpage
147 associated-control="[[$$('#subpage-trigger')]]" 148 associated-control="[[$$('#subpage-trigger')]]"
148 page-title="$i18n{searchEnginesManage}"> 149 page-title="$i18n{searchEnginesManage}">
149 <settings-search-engines-page></settings-search-engines-page> 150 <settings-search-engines-page></settings-search-engines-page>
150 </settings-subpage> 151 </settings-subpage>
151 </template> 152 </template>
152 </settings-animated-pages> 153 </settings-animated-pages>
153 </template> 154 </template>
154 <script src="search_page.js"></script> 155 <script src="search_page.js"></script>
155 </dom-module> 156 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698