OLD | NEW |
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/polymer.html"> | 2 <link rel="import" href="chrome://resources/html/polymer.html"> |
3 <link rel="import" href="chrome://md-settings/appearance_page/appearance_page.ht
ml"> | 3 <link rel="import" href="chrome://md-settings/appearance_page/appearance_page.ht
ml"> |
4 <link rel="import" href="chrome://md-settings/search_page/search_page.html"> | 4 <link rel="import" href="chrome://md-settings/search_page/search_page.html"> |
| 5 <link rel="import" href="chrome://md-settings/settings_page/main_page_behavior.h
tml"> |
5 <link rel="import" href="chrome://md-settings/settings_page/settings_page_visibi
lity.html"> | 6 <link rel="import" href="chrome://md-settings/settings_page/settings_page_visibi
lity.html"> |
6 <link rel="import" href="chrome://md-settings/settings_page/settings_section.htm
l"> | 7 <link rel="import" href="chrome://md-settings/settings_page/settings_section.htm
l"> |
7 <link rel="import" href="chrome://md-settings/on_startup_page/on_startup_page.ht
ml"> | 8 <link rel="import" href="chrome://md-settings/on_startup_page/on_startup_page.ht
ml"> |
8 <link rel="import" href="chrome://md-settings/people_page/people_page.html"> | 9 <link rel="import" href="chrome://md-settings/people_page/people_page.html"> |
9 <link rel="import" href="chrome://md-settings/reset_page/reset_profile_banner.ht
ml"> | 10 <link rel="import" href="chrome://md-settings/reset_page/reset_profile_banner.ht
ml"> |
10 | 11 |
11 <if expr="chromeos"> | 12 <if expr="chromeos"> |
12 <link rel="import" href="chrome://md-settings/device_page/device_page.html"> | 13 <link rel="import" href="chrome://md-settings/device_page/device_page.html"> |
13 <link rel="import" href="chrome://md-settings/internet_page/internet_page.html"> | 14 <link rel="import" href="chrome://md-settings/internet_page/internet_page.html"> |
14 </if> | 15 </if> |
15 | 16 |
16 <if expr="not chromeos"> | 17 <if expr="not chromeos"> |
17 <link rel="import" href="chrome://md-settings/default_browser_page/default_brows
er_page.html"> | 18 <link rel="import" href="chrome://md-settings/default_browser_page/default_brows
er_page.html"> |
18 </if> | 19 </if> |
19 | 20 |
20 <dom-module id="settings-basic-page"> | 21 <dom-module id="settings-basic-page"> |
21 <link rel="import" type="css" href="chrome://md-settings/settings_page.css"> | 22 <link rel="import" type="css" href="chrome://md-settings/settings_page.css"> |
22 <template> | 23 <template> |
| 24 <style include="main-page-styles"></style> |
23 <template is="dom-if" if="[[showResetProfileBanner_]]"> | 25 <template is="dom-if" if="[[showResetProfileBanner_]]"> |
24 <settings-reset-profile-banner on-reset-done="onResetDone_"> | 26 <settings-reset-profile-banner on-reset-done="onResetDone_"> |
25 </settings-reset-profile-banner> | 27 </settings-reset-profile-banner> |
26 </template> | 28 </template> |
27 <if expr="chromeos"> | 29 <if expr="chromeos"> |
28 <template is="dom-if" if="[[showPage(pageVisibility.internet)]]" restamp> | 30 <template is="dom-if" if="[[showPage(pageVisibility.internet)]]" restamp> |
29 <settings-section page-title="[[i18n('internetPageTitle')]]" | 31 <settings-section page-title="[[i18n('internetPageTitle')]]" |
30 current-route="[[currentRoute]]" section="internet"> | 32 current-route="[[currentRoute]]" section="internet"> |
31 <settings-internet-page current-route="{{currentRoute}}"> | 33 <settings-internet-page current-route="{{currentRoute}}"> |
32 </settings-internet-page> | 34 </settings-internet-page> |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
81 expand-container="{{expandContainer}}" | 83 expand-container="{{expandContainer}}" |
82 current-route="[[currentRoute]]" section="defaultBrowser"> | 84 current-route="[[currentRoute]]" section="defaultBrowser"> |
83 <settings-default-browser-page> | 85 <settings-default-browser-page> |
84 </settings-default-browser-page> | 86 </settings-default-browser-page> |
85 </settings-section> | 87 </settings-section> |
86 </template> | 88 </template> |
87 </if> | 89 </if> |
88 </template> | 90 </template> |
89 <script src="basic_page.js"></script> | 91 <script src="basic_page.js"></script> |
90 </dom-module> | 92 </dom-module> |
OLD | NEW |