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/settings_main/settings_main.html

Issue 1239963004: Settings Rewrite: Morph old MD-Settings to Basic and Advanced menu. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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/polymer/v1_0/polymer/polymer.html"> 1 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">
2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-pages/iron-pages.h tml"> 2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-pages/iron-pages.h tml">
3 <link rel="import" href="chrome://resources/polymer/v1_0/more-routing/more-routi ng.html"> 3 <link rel="import" href="chrome://resources/polymer/v1_0/more-routing/more-routi ng.html">
4 <link rel="import" href="chrome://md-settings/routes.html"> 4 <link rel="import" href="chrome://md-settings/routes.html">
5 <link rel="import" href="chrome://md-settings/advanced_page/advanced_page.html">
6 <link rel="import" href="chrome://md-settings/basic_page/basic_page.html">
7 <link rel="import" href="chrome://md-settings/internet_page/internet_detail_page .html">
8 <link rel="import" href="chrome://md-settings/search_engines_page/search_engines _page.html">
5 <link rel="import" href="chrome://md-settings/settings_page/settings_page_header .html"> 9 <link rel="import" href="chrome://md-settings/settings_page/settings_page_header .html">
6 <link rel="import" href="chrome://md-settings/a11y_page/a11y_page.html">
7 <link rel="import" href="chrome://md-settings/appearance_page/appearance_page.ht ml">
8 <link rel="import" href="chrome://md-settings/date_time_page/date_time_page.html ">
9 <link rel="import" href="chrome://md-settings/downloads_page/downloads_page.html ">
10 <link rel="import" href="chrome://md-settings/privacy_page/privacy_page.html">
11 <link rel="import" href="chrome://md-settings/search_engines_page/search_engines _page.html">
12 <link rel="import" href="chrome://md-settings/search_page/search_page.html">
13 <link rel="import" href="chrome://md-settings/sync_page/sync_page.html">
14 <link rel="import" href="chrome://md-settings/users_page/users_page.html">
15 <link rel="import" href="chrome://md-settings/internet_page/internet_page.html">
16 <link rel="import" href="chrome://md-settings/internet_page/internet_detail_page .html">
17 10
18 <dom-module id="cr-settings-main"> 11 <dom-module id="cr-settings-main">
19 <link rel="import" type="css" href="settings_main.css"> 12 <link rel="import" type="css" href="settings_main.css">
20 <template> 13 <template>
21 <div id="mainContainer"> 14 <div id="mainContainer">
22 <cr-settings-page-header selected-page="[[selectedPage]]"> 15 <cr-settings-page-header selected-page="[[selectedPage]]">
23 </cr-settings-page-header> 16 </cr-settings-page-header>
24 <content select="paper-icon-button"></content> 17 <content select="paper-icon-button"></content>
25 <more-route-selector selected-params="{{params}}"> 18 <more-route-selector selected-params="{{params}}">
26 <iron-pages id="pageContainer" selected-item="{{selectedPage}}" 19 <iron-pages id="pageContainer" selected-item="{{selectedPage}}"
27 on-iron-select="onIronSelect_" attr-for-selected="PAGE_ID"> 20 on-iron-select="onIronSelect_" attr-for-selected="PAGE_ID">
21 <cr-settings-basic-page prefs="{{prefs}}" route="basic">
22 </cr-settings-basic-page>
23 <cr-settings-advanced-page prefs="{{prefs}}" route="advanced">
24 </cr-settings-advanced-page>
28 <if expr="chromeos"> 25 <if expr="chromeos">
29 <cr-settings-internet-page route="internet">
30 </cr-settings-internet-page>
31 <cr-settings-internet-detail-page route="internet-detail" 26 <cr-settings-internet-detail-page route="internet-detail"
michaelpg 2015/07/20 21:23:10 There's something weird about having all the top-l
tommycli 2015/07/20 22:58:58 Acknowledged.
32 subpage="true" guid="[[params.guid]]" 27 subpage="true" guid="[[params.guid]]"
33 selected-page="[[selectedPage]]"> 28 selected-page="[[selectedPage]]">
34 </cr-settings-internet-detail-page> 29 </cr-settings-internet-detail-page>
35 </if> 30 </if>
36 <cr-settings-a11y-page prefs="{{prefs}}" route="a11y">
37 </cr-settings-a11y-page>
38 <cr-settings-appearance-page prefs="{{prefs}}" route="appearance">
39 </cr-settings-appearance-page>
40 <if expr="chromeos">
41 <cr-settings-date-time-page prefs="{{prefs}}" route="dateTime">
42 </cr-settings-date-time-page>
43 </if>
44 <cr-settings-privacy-page prefs="{{prefs}}" route="privacy">
45 </cr-settings-privacy-page>
46 <cr-settings-downloads-page prefs="{{prefs}}" route="downloads">
47 </cr-settings-downloads-page>
48 <cr-settings-search-page route="search"></cr-settings-search-page>
49 <cr-settings-search-engines-page route="search-engines"> 31 <cr-settings-search-engines-page route="search-engines">
50 </cr-settings-search-engines-page> 32 </cr-settings-search-engines-page>
51 <cr-settings-sync-page route="sync"></cr-settings-sync-page>
52 <cr-settings-users-page prefs="{{prefs}}" route="users">
53 </cr-settings-users-page>
54 </iron-pages> 33 </iron-pages>
55 </more-route-selector> 34 </more-route-selector>
56 </div> 35 </div>
57 </template> 36 </template>
58 <script src="settings_main.js"></script> 37 <script src="settings_main.js"></script>
59 </dom-module> 38 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698