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

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

Issue 2615673003: [MD WebUI] Move icons used in Bookmarks and Settings to shared file. (Closed)
Patch Set: reorder some icons Created 3 years, 11 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/cr_elements/icons.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/neon-animation/neon-ani matable.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-button/paper-butt on.html">
6 <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">
7 <link rel="import" href="/controls/extension_controlled_indicator.html"> 8 <link rel="import" href="/controls/extension_controlled_indicator.html">
8 <link rel="import" href="/controls/settings_checkbox.html"> 9 <link rel="import" href="/controls/settings_checkbox.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
19 <dom-module id="settings-search-page"> 19 <dom-module id="settings-search-page">
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
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_.*,
101 hotwordSearchEnablePref_)]]"> 101 hotwordSearchEnablePref_)]]">
102 <div class="settings-box continuation indented"> 102 <div class="settings-box continuation indented">
103 <iron-icon icon="settings:warning"></iron-icon> 103 <iron-icon icon="cr:warning"></iron-icon>
104 <div inner-h-t-m-l="[[hotwordInfo_.errorMessage]]"></div> 104 <div inner-h-t-m-l="[[hotwordInfo_.errorMessage]]"></div>
105 </div> 105 </div>
106 </template> 106 </template>
107 107
108 <template is="dom-if" if="[[hotwordInfo_.historyEnabled]]"> 108 <template is="dom-if" if="[[hotwordInfo_.historyEnabled]]">
109 <div class="settings-box two-line continuation indented" 109 <div class="settings-box two-line continuation indented"
110 on-tap="onManageAudioHistoryTap_" actionable> 110 on-tap="onManageAudioHistoryTap_" actionable>
111 <div class="start"> 111 <div class="start">
112 <div> 112 <div>
113 [[i18n('searchOkGoogleAudioHistoryLabel', 113 [[i18n('searchOkGoogleAudioHistoryLabel',
(...skipping 25 matching lines...) Expand all
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>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698