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

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: set upstream 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/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_toggle_button.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">
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 <template is="dom-if" if="[[hotwordInfo_.allowed]]"> 81 <template is="dom-if" if="[[hotwordInfo_.allowed]]">
82 <!-- Hotword (OK Google) --> 82 <!-- Hotword (OK Google) -->
83 <div class="settings-box two-line continuation indented"> 83 <div class="settings-box two-line continuation indented">
84 <settings-toggle-button id="hotwordSearchEnable" class="start" 84 <settings-toggle-button id="hotwordSearchEnable" class="start"
85 pref="{{hotwordSearchEnablePref_}}" 85 pref="{{hotwordSearchEnablePref_}}"
86 label="$i18n{searchOkGoogleLabel}" 86 label="$i18n{searchOkGoogleLabel}"
87 sub-label="[[getHotwordSearchEnableSubLabel_( 87 sub-label="[[getHotwordSearchEnableSubLabel_(
88 hotwordInfo_.alwaysOn)]]" 88 hotwordInfo_.alwaysOn)]]"
89 on-change="onHotwordSearchEnableChange_"> 89 on-change="onHotwordSearchEnableChange_">
90 </settings-toggle-button> 90 </settings-toggle-button>
91 <div class="secondary-action" 91 <div class="layout horizontal center"
hcarmona 2017/05/01 18:12:30 Why don't other sections need these changes?
dschuyler 2017/05/01 19:12:08 This is here for the sake of making a group to hid
92 hidden$="[[!getShowHotwordSearchRetrain_(hotwordInfo_.*)]]"> 92 hidden$="[[!getShowHotwordSearchRetrain_(hotwordInfo_.*)]]">
93 <div class="separator"></div>
93 <paper-button on-tap="onRetrainTap_" class="secondary-button"> 94 <paper-button on-tap="onRetrainTap_" class="secondary-button">
94 $i18n{searchOkGoogleRetrain} 95 $i18n{searchOkGoogleRetrain}
95 </paper-button> 96 </paper-button>
96 </div> 97 </div>
97 </div> 98 </div>
98 99
99 <template is="dom-if" 100 <template is="dom-if"
100 if="[[getShowHotwordError_(hotwordInfo_.*, 101 if="[[getShowHotwordError_(hotwordInfo_.*,
101 hotwordSearchEnablePref_)]]"> 102 hotwordSearchEnablePref_)]]">
102 <div class="settings-box continuation indented"> 103 <div class="settings-box continuation indented">
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 <settings-subpage 138 <settings-subpage
138 associated-control="[[$$('#subpage-trigger')]]" 139 associated-control="[[$$('#subpage-trigger')]]"
139 page-title="$i18n{searchEnginesManage}"> 140 page-title="$i18n{searchEnginesManage}">
140 <settings-search-engines-page></settings-search-engines-page> 141 <settings-search-engines-page></settings-search-engines-page>
141 </settings-subpage> 142 </settings-subpage>
142 </template> 143 </template>
143 </settings-animated-pages> 144 </settings-animated-pages>
144 </template> 145 </template>
145 <script src="search_page.js"></script> 146 <script src="search_page.js"></script>
146 </dom-module> 147 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698