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

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

Issue 1138013005: Lots of small fixes to help wire things together for the 0.8 upgrade. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove undefined observer Created 5 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/polymer/v0_8/polymer/polymer.html"> 1 <link rel="import" href="chrome://resources/polymer/v0_8/polymer/polymer.html">
2 <link rel="import" href="chrome://resources/polymer/v0_8/iron-pages/iron-pages.h tml"> 2 <link rel="import" href="chrome://resources/polymer/v0_8/iron-pages/iron-pages.h tml">
3 <link rel="import" href="chrome://md-settings/routes.html"> 3 <link rel="import" href="chrome://md-settings/routes.html">
4
5 <!-- TODO: Uncomment pages as they are upgraded.
6 <link rel="import" href="chrome://md-settings/a11y_page/a11y_page.html"> 4 <link rel="import" href="chrome://md-settings/a11y_page/a11y_page.html">
7 <link rel="import" href="chrome://md-settings/date_time_page/date_time_page.html "> 5 <link rel="import" href="chrome://md-settings/date_time_page/date_time_page.html ">
8 <link rel="import" href="chrome://md-settings/downloads_page/downloads_page.html "> 6 <link rel="import" href="chrome://md-settings/downloads_page/downloads_page.html ">
7 <link rel="import" href="chrome://md-settings/search_engines_page/search_engines _page.html">
8 <link rel="import" href="chrome://md-settings/search_page/search_page.html">
9
10 <!-- TODO: Uncomment pages as they are upgraded.
9 <link rel="import" href="chrome://md-settings/internet_page/internet_page.html"> 11 <link rel="import" href="chrome://md-settings/internet_page/internet_page.html">
10 <link rel="import" href="chrome://md-settings/internet_page/internet_detail_page .html"> 12 <link rel="import" href="chrome://md-settings/internet_page/internet_detail_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 --> 13 -->
14 14
15 <dom-module id="cr-settings-main"> 15 <dom-module id="cr-settings-main">
16 <link rel="import" type="css" href="settings_main.css"> 16 <link rel="import" type="css" href="settings_main.css">
17 <template> 17 <template>
18 <div id="mainContainer"> 18 <div id="mainContainer">
19 <cr-settings-page-header selected-page="[[selectedPage]]"> 19 <cr-settings-page-header selected-page="[[selectedPage]]">
20 </cr-settings-page-header> 20 </cr-settings-page-header>
21 <content select="paper-icon-button"></content> 21 <content select="paper-icon-button"></content>
22 <more-route-selector selected-params="{{params}}"> 22 <more-route-selector selected-params="{{params}}">
23 <iron-pages id="pageContainer" selected-item="{{selectedPage}}" 23 <iron-pages id="pageContainer" selected-item="{{selectedPage}}"
24 on-iron-select="onIronSelect_" attr-for-selected="PAGE_ID"> 24 on-iron-select="onIronSelect_" attr-for-selected="PAGE_ID">
25 <!-- TODO: Uncomment pages as they are upgraded. --> 25 <!-- TODO: Uncomment pages as they are upgraded. -->
26 <if expr="chromeos"> 26 <if expr="chromeos">
27 <!-- 27 <!--
28 <cr-settings-internet-page route="internet"> 28 <cr-settings-internet-page route="internet">
29 </cr-settings-internet-page> 29 </cr-settings-internet-page>
30 --> 30 -->
31 <!-- 31 <!--
32 <cr-settings-internet-detail-page route="internet-detail" 32 <cr-settings-internet-detail-page route="internet-detail"
33 subpage="true" guid="{{params.guid}}"> 33 subpage="true" guid="{{params.guid}}">
34 </cr-settings-internet-detail-page> 34 </cr-settings-internet-detail-page>
35 --> 35 -->
36 </if> 36 </if>
37 <!--
38 <cr-settings-a11y-page prefs="{{prefs}}" route="a11y"> 37 <cr-settings-a11y-page prefs="{{prefs}}" route="a11y">
39 </cr-settings-a11y-page> 38 </cr-settings-a11y-page>
40 -->
41 <if expr="chromeos"> 39 <if expr="chromeos">
42 <!--
43 <cr-settings-date-time-page prefs="{{prefs}}" route="dateTime"> 40 <cr-settings-date-time-page prefs="{{prefs}}" route="dateTime">
44 </cr-settings-date-time-page> 41 </cr-settings-date-time-page>
45 </if> 42 </if>
46 -->
47 <!--
48 <cr-settings-downloads-page prefs="{{prefs}}" route="downloads"> 43 <cr-settings-downloads-page prefs="{{prefs}}" route="downloads">
49 </cr-settings-downloads-page> 44 </cr-settings-downloads-page>
50 -->
51 <!--
52 <cr-settings-search-page prefs="{{prefs}}" route="search"> 45 <cr-settings-search-page prefs="{{prefs}}" route="search">
53 </cr-settings-search-page> 46 </cr-settings-search-page>
54 -->
55 <!--
56 <cr-settings-search-engines-page prefs="{{prefs}}" 47 <cr-settings-search-engines-page prefs="{{prefs}}"
57 route="search-engines"> 48 route="search-engines">
58 </cr-settings-search-engines-page> 49 </cr-settings-search-engines-page>
59 -->
60 </iron-pages> 50 </iron-pages>
61 </more-route-selector> 51 </more-route-selector>
62 </div> 52 </div>
63 </template> 53 </template>
64 <script src="settings_main.js"></script> 54 <script src="settings_main.js"></script>
65 </polymer-element> 55 </polymer-element>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698