OLD | NEW |
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="/appearance_page/appearance_page.html"> | 2 <link rel="import" href="/appearance_page/appearance_page.html"> |
3 <link rel="import" href="/search_page/search_page.html"> | 3 <link rel="import" href="/search_page/search_page.html"> |
4 <link rel="import" href="/settings_page/main_page_behavior.html"> | 4 <link rel="import" href="/settings_page/main_page_behavior.html"> |
5 <link rel="import" href="/settings_page/settings_page_visibility.html"> | 5 <link rel="import" href="/settings_page/settings_page_visibility.html"> |
6 <link rel="import" href="/settings_page/settings_section.html"> | 6 <link rel="import" href="/settings_page/settings_section.html"> |
7 <link rel="import" href="/on_startup_page/on_startup_page.html"> | 7 <link rel="import" href="/on_startup_page/on_startup_page.html"> |
8 <link rel="import" href="/people_page/people_page.html"> | 8 <link rel="import" href="/people_page/people_page.html"> |
9 <link rel="import" href="/reset_page/reset_profile_banner.html"> | 9 <link rel="import" href="/reset_page/reset_profile_banner.html"> |
10 <link rel="import" href="/settings_page_css.html"> | 10 <link rel="import" href="/settings_page_css.html"> |
11 | 11 |
12 <if expr="chromeos"> | 12 <if expr="chromeos"> |
| 13 <link rel="import" href="/android_apps_page/android_apps_page.html"> |
13 <link rel="import" href="/device_page/device_page.html"> | 14 <link rel="import" href="/device_page/device_page.html"> |
14 <link rel="import" href="/internet_page/internet_page.html"> | 15 <link rel="import" href="/internet_page/internet_page.html"> |
15 </if> | 16 </if> |
16 | 17 |
17 <if expr="not chromeos"> | 18 <if expr="not chromeos"> |
18 <link rel="import" href="/default_browser_page/default_browser_page.html"> | 19 <link rel="import" href="/default_browser_page/default_browser_page.html"> |
19 </if> | 20 </if> |
20 | 21 |
21 <dom-module id="settings-basic-page"> | 22 <dom-module id="settings-basic-page"> |
22 <template> | 23 <template> |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
54 <settings-section page-title="$i18n{devicePageTitle}" section="device"> | 55 <settings-section page-title="$i18n{devicePageTitle}" section="device"> |
55 <settings-device-page prefs="{{prefs}}"></settings-device-page> | 56 <settings-device-page prefs="{{prefs}}"></settings-device-page> |
56 </settings-section> | 57 </settings-section> |
57 </template> | 58 </template> |
58 </if> | 59 </if> |
59 <template is="dom-if" if="[[showPage(pageVisibility.search)]]" restamp> | 60 <template is="dom-if" if="[[showPage(pageVisibility.search)]]" restamp> |
60 <settings-section page-title="$i18n{searchPageTitle}" section="search"> | 61 <settings-section page-title="$i18n{searchPageTitle}" section="search"> |
61 <settings-search-page prefs="[[prefs]]"></settings-search-page> | 62 <settings-search-page prefs="[[prefs]]"></settings-search-page> |
62 </settings-section> | 63 </settings-section> |
63 </template> | 64 </template> |
| 65 <if expr="chromeos"> |
| 66 <template is="dom-if" if="[[showPage(pageVisibility.androidApps)]]" |
| 67 restamp> |
| 68 <settings-section page-title="$i18n{androidAppsPageTitle}" |
| 69 section="androidApps"> |
| 70 <settings-android-apps-page prefs="{{prefs}}"> |
| 71 </settings-android-apps-page> |
| 72 </settings-section> |
| 73 </template> |
| 74 </if> |
64 <if expr="not chromeos"> | 75 <if expr="not chromeos"> |
65 <template is="dom-if" if="[[showPage(pageVisibility.defaultBrowser)]]" | 76 <template is="dom-if" if="[[showPage(pageVisibility.defaultBrowser)]]" |
66 restamp> | 77 restamp> |
67 <settings-section page-title="$i18n{defaultBrowser}" | 78 <settings-section page-title="$i18n{defaultBrowser}" |
68 section="defaultBrowser"> | 79 section="defaultBrowser"> |
69 <settings-default-browser-page></settings-default-browser-page> | 80 <settings-default-browser-page></settings-default-browser-page> |
70 </settings-section> | 81 </settings-section> |
71 </template> | 82 </template> |
72 </if> | 83 </if> |
73 <template is="dom-if" if="[[showPage(pageVisibility.onStartup)]]" restamp> | 84 <template is="dom-if" if="[[showPage(pageVisibility.onStartup)]]" restamp> |
74 <settings-section page-title="$i18n{onStartup}" section="onStartup"> | 85 <settings-section page-title="$i18n{onStartup}" section="onStartup"> |
75 <settings-on-startup-page prefs="{{prefs}}"> | 86 <settings-on-startup-page prefs="{{prefs}}"> |
76 </settings-on-startup-page> | 87 </settings-on-startup-page> |
77 </settings-section> | 88 </settings-section> |
78 </template> | 89 </template> |
79 </div> | 90 </div> |
80 </template> | 91 </template> |
81 <script src="basic_page.js"></script> | 92 <script src="basic_page.js"></script> |
82 </dom-module> | 93 </dom-module> |
OLD | NEW |