| 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 abb32bf9098893736246bd7d727ba2ebfe18a664..c9db620bf40a9c6296474478cd0a5b6f3d866c2e 100644
|
| --- a/chrome/browser/resources/settings/basic_page/basic_page.html
|
| +++ b/chrome/browser/resources/settings/basic_page/basic_page.html
|
| @@ -3,7 +3,6 @@
|
| <link rel="import" href="/search_page/search_page.html">
|
| <link rel="import" href="/settings_page/main_page_behavior.html">
|
| <link rel="import" href="/settings_page/settings_page_visibility.html">
|
| -<link rel="import" href="/settings_page/settings_router.html">
|
| <link rel="import" href="/settings_page/settings_section.html">
|
| <link rel="import" href="/on_startup_page/on_startup_page.html">
|
| <link rel="import" href="/people_page/people_page.html">
|
| @@ -30,62 +29,50 @@
|
| <if expr="chromeos">
|
| <template is="dom-if" if="[[showPage(pageVisibility.internet)]]" restamp>
|
| <settings-section page-title="$i18n{internetPageTitle}"
|
| - current-route="[[currentRoute]]" section="internet">
|
| - <settings-internet-page current-route="{{currentRoute}}">
|
| + section="internet">
|
| + <settings-internet-page>
|
| </settings-internet-page>
|
| </settings-section>
|
| </template>
|
| </if>
|
| <template is="dom-if" if="[[showPage(pageVisibility.people)]]" restamp>
|
| - <settings-section page-title="$i18n{peoplePageTitle}"
|
| - current-route="[[currentRoute]]" section="people">
|
| - <settings-people-page prefs="{{prefs}}"
|
| - current-route="{{currentRoute}}">
|
| - </settings-people-page>
|
| + <settings-section page-title="$i18n{peoplePageTitle}" section="people">
|
| + <settings-people-page prefs="{{prefs}}"></settings-people-page>
|
| </settings-section>
|
| </template>
|
| <template is="dom-if" if="[[showPage(pageVisibility.appearance)]]"
|
| restamp>
|
| <settings-section page-title="$i18n{appearancePageTitle}"
|
| - current-route="[[currentRoute]]" section="appearance">
|
| + section="appearance">
|
| <settings-appearance-page prefs="{{prefs}}"
|
| - current-route="{{currentRoute}}"
|
| page-visibility="[[pageVisibility.appearance]]">
|
| </settings-appearance-page>
|
| </settings-section>
|
| </template>
|
| <if expr="chromeos">
|
| <template is="dom-if" if="[[showPage(pageVisibility.device)]]" restamp>
|
| - <settings-section page-title="$i18n{devicePageTitle}"
|
| - current-route="[[currentRoute]]" section="device">
|
| - <settings-device-page prefs="{{prefs}}"
|
| - current-route="{{currentRoute}}">
|
| - </settings-device-page>
|
| + <settings-section page-title="$i18n{devicePageTitle}" section="device">
|
| + <settings-device-page prefs="{{prefs}}"></settings-device-page>
|
| </settings-section>
|
| </template>
|
| </if>
|
| <template is="dom-if" if="[[showPage(pageVisibility.search)]]" restamp>
|
| - <settings-section page-title="$i18n{searchPageTitle}"
|
| - current-route="[[currentRoute]]" section="search">
|
| - <settings-search-page current-route="{{currentRoute}}">
|
| - </settings-search-page>
|
| + <settings-section page-title="$i18n{searchPageTitle}" section="search">
|
| + <settings-search-page></settings-search-page>
|
| </settings-section>
|
| </template>
|
| <if expr="not chromeos">
|
| <template is="dom-if" if="[[showPage(pageVisibility.defaultBrowser)]]"
|
| restamp>
|
| <settings-section page-title="$i18n{defaultBrowser}"
|
| - current-route="[[currentRoute]]" section="defaultBrowser">
|
| - <settings-default-browser-page>
|
| - </settings-default-browser-page>
|
| + section="defaultBrowser">
|
| + <settings-default-browser-page></settings-default-browser-page>
|
| </settings-section>
|
| </template>
|
| </if>
|
| <template is="dom-if" if="[[showPage(pageVisibility.onStartup)]]" restamp>
|
| - <settings-section page-title="$i18n{onStartup}"
|
| - current-route="[[currentRoute]]" section="onStartup">
|
| - <settings-on-startup-page prefs="{{prefs}}"
|
| - current-route="{{currentRoute}}">
|
| + <settings-section page-title="$i18n{onStartup}" section="onStartup">
|
| + <settings-on-startup-page prefs="{{prefs}}">
|
| </settings-on-startup-page>
|
| </settings-section>
|
| </template>
|
|
|