| Index: chrome/browser/resources/settings/basic_page/basic_page.html
|
| diff --git a/chrome/browser/resources/settings/basic_page/basic_page.html b/chrome/browser/resources/settings/basic_page/basic_page.html
|
| index 3fe3df82989a61f083b76465de8c4d04d2fbe32b..90b9a69080fb14132feff64ef1dbd794116aae08 100644
|
| --- a/chrome/browser/resources/settings/basic_page/basic_page.html
|
| +++ b/chrome/browser/resources/settings/basic_page/basic_page.html
|
| @@ -1,22 +1,38 @@
|
| <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">
|
| <link rel="import" href="chrome://md-settings/appearance_page/appearance_page.html">
|
| -<link rel="import" href="chrome://md-settings/internet_page/internet_page.html">
|
| <link rel="import" href="chrome://md-settings/search_page/search_page.html">
|
| +<link rel="import" href="chrome://md-settings/settings_page/settings_section.html">
|
| +
|
| +<if expr="chromeos">
|
| +<link rel="import" href="chrome://md-settings/internet_page/internet_page.html">
|
| <link rel="import" href="chrome://md-settings/users_page/users_page.html">
|
| +</if>
|
|
|
| <dom-module id="cr-settings-basic-page">
|
| - <link rel="import" type="css"
|
| - href="chrome://md-settings/settings_page/settings_page.css">
|
| <template>
|
| <if expr="chromeos">
|
| - <cr-settings-internet-page route="internet">
|
| - </cr-settings-internet-page>
|
| + <cr-settings-section route="internet" icon="settings-ethernet"
|
| + i18n-values="page-title:internetPageTitle">
|
| + <cr-settings-internet-page></cr-settings-internet-page>
|
| + </cr-settings-section>
|
| +</if>
|
| + <cr-settings-section route="appearance" icon="home"
|
| + i18n-values="page-title:appearancePageTitle">
|
| + <cr-settings-appearance-page prefs="{{prefs}}">
|
| + </cr-settings-appearance-page>
|
| + </cr-settings-section>
|
| +
|
| + <cr-settings-section route="search" icon="search"
|
| + i18n-values="page-title:searchPageTitle">
|
| + <cr-settings-search-page></cr-settings-search-page>
|
| + </cr-settings-section>
|
| +
|
| +<if expr="chromeos">
|
| + <cr-settings-section route="users" icon="person"
|
| + i18n-values="page-title:usersPageTitle">
|
| + <cr-settings-users-page prefs="{{prefs}}"></cr-settings-users-page>
|
| + </cr-settings-section>
|
| </if>
|
| - <cr-settings-appearance-page prefs="{{prefs}}" route="appearance">
|
| - </cr-settings-appearance-page>
|
| - <cr-settings-search-page route="search"></cr-settings-search-page>
|
| - <cr-settings-users-page prefs="{{prefs}}" route="users">
|
| - </cr-settings-users-page>
|
| </template>
|
| <script src="basic_page.js"></script>
|
| </dom-module>
|
|
|