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

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

Issue 2378253003: MD Settings: Search page, switching paper-dropdown-menu to native select. (Closed)
Patch Set: Merge conflicts. Created 4 years, 2 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
« no previous file with comments | « no previous file | chrome/browser/resources/settings/search_page/search_page.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <link rel="import" href="chrome://resources/html/polymer.html"> 1 <link rel="import" href="chrome://resources/html/polymer.html">
2 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> 2 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">
3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-dropdown-menu/pap er-dropdown-menu-light.html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> 4 <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-listbox/paper-lis tbox.html">
7 <link rel="import" href="/route.html"> 5 <link rel="import" href="/route.html">
8 <link rel="import" href="/search_engines_page/search_engines_page.html"> 6 <link rel="import" href="/search_engines_page/search_engines_page.html">
9 <link rel="import" href="/search_engines_page/search_engines_browser_proxy.html" > 7 <link rel="import" href="/search_engines_page/search_engines_browser_proxy.html" >
10 <link rel="import" href="/settings_page/settings_animated_pages.html"> 8 <link rel="import" href="/settings_page/settings_animated_pages.html">
11 <link rel="import" href="/settings_page/settings_subpage.html"> 9 <link rel="import" href="/settings_page/settings_subpage.html">
12 <link rel="import" href="/settings_shared_css.html"> 10 <link rel="import" href="/settings_shared_css.html">
11 <link rel="import" href="/select_css.html">
13 12
14 <dom-module id="settings-search-page"> 13 <dom-module id="settings-search-page">
15 <template> 14 <template>
16 <style include="settings-shared"></style> 15 <style include="settings-shared select"></style>
17 <settings-animated-pages id="pages" section="search"> 16 <settings-animated-pages id="pages" section="search">
18 <neon-animatable route-path="default"> 17 <neon-animatable route-path="default">
19 <div class="settings-box first"> 18 <div class="settings-box first">
20 <p class="start">$i18n{searchExplanation}</p> 19 <p class="start">$i18n{searchExplanation}</p>
21 <paper-dropdown-menu-light vertical-align="auto" no-label-float> 20 <div>
22 <paper-listbox class="dropdown-content" 21 <select on-change="onChange_">
23 selected="[[getSelectedSearchEngineIndex_(searchEngines_)]]"
24 on-iron-select="onIronSelect_">
25 <template is="dom-repeat" items="[[searchEngines_]]"> 22 <template is="dom-repeat" items="[[searchEngines_]]">
26 <button class="dropdown-item" role="option"> 23 <option selected$="[[item.default]]">[[item.name]]</option>
27 [[item.name]]
28 </button>
29 </template> 24 </template>
30 </paper-listbox> 25 </select>
31 </paper-dropdown-menu-light> 26 <span class="select-underline"></span>
27 </div>
32 </div> 28 </div>
33 <div id="subpage-trigger" class="settings-box two-line" 29 <div id="subpage-trigger" class="settings-box two-line"
34 on-tap="onManageSearchEnginesTap_" actionable> 30 on-tap="onManageSearchEnginesTap_" actionable>
35 <div class="start"> 31 <div class="start">
36 $i18n{searchEnginesManage} 32 $i18n{searchEnginesManage}
37 <div class="secondary"> 33 <div class="secondary">
38 $i18n{searchEnginesManageDescription} 34 $i18n{searchEnginesManageDescription}
39 </div> 35 </div>
40 </div> 36 </div>
41 <button class="icon-arrow-right" is="paper-icon-button-light"> 37 <button class="icon-arrow-right" is="paper-icon-button-light">
42 </button> 38 </button>
43 </div> 39 </div>
44 </neon-animatable> 40 </neon-animatable>
45 <template is="dom-if" route-path="/searchEngines"> 41 <template is="dom-if" route-path="/searchEngines">
46 <settings-subpage 42 <settings-subpage
47 associated-control="[[$$('#subpage-trigger')]]" 43 associated-control="[[$$('#subpage-trigger')]]"
48 page-title="$i18n{searchEnginesManage}"> 44 page-title="$i18n{searchEnginesManage}">
49 <settings-search-engines-page></settings-search-engines-page> 45 <settings-search-engines-page></settings-search-engines-page>
50 </settings-subpage> 46 </settings-subpage>
51 </template> 47 </template>
52 </settings-animated-pages> 48 </settings-animated-pages>
53 </template> 49 </template>
54 <script src="search_page.js"></script> 50 <script src="search_page.js"></script>
55 </dom-module> 51 </dom-module>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/settings/search_page/search_page.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698