chrome/browser/resources/settings/settings_main/settings_main.html - Issue 1241363002: Settings Rewrite: Make a common settings-section component.

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

Issue 1241363002: Settings Rewrite: Make a common settings-section component. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@0300-webui-settings-structure

Patch Set: Created 5 years, 5 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

« chrome/browser/resources/settings/advanced_page/advanced_page.html ('K') | « chrome/browser/resources/settings/search_page/search_page.html ('k') | chrome/browser/resources/settings/settings_page/settings_section.css » ('j') | chrome/browser/resources/settings/settings_page/settings_section.css » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">	1 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">

2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-pages/iron-pages.h tml">	2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-pages/iron-pages.h tml">

3 <link rel="import" href="chrome://resources/polymer/v1_0/more-routing/more-routi ng.html">	3 <link rel="import" href="chrome://resources/polymer/v1_0/more-routing/more-routi ng.html">

4 <link rel="import" href="chrome://md-settings/routes.html">	4 <link rel="import" href="chrome://md-settings/routes.html">

5 <link rel="import" href="chrome://md-settings/advanced_page/advanced_page.html">	5 <link rel="import" href="chrome://md-settings/advanced_page/advanced_page.html">

6 <link rel="import" href="chrome://md-settings/basic_page/basic_page.html">	6 <link rel="import" href="chrome://md-settings/basic_page/basic_page.html">

7 <link rel="import" href="chrome://md-settings/internet_page/internet_detail_page .html">

8 <link rel="import" href="chrome://md-settings/search_engines_page/search_engines _page.html">	7 <link rel="import" href="chrome://md-settings/search_engines_page/search_engines _page.html">

9 <link rel="import" href="chrome://md-settings/settings_page/settings_page_header .html">	8 <link rel="import" href="chrome://md-settings/settings_page/settings_page_header .html">

10	9

	10 <if expr="chromeos">

	11 <link rel="import" href="chrome://md-settings/internet_page/internet_detail_page .html">

	12 </if>

	13

11 <dom-module id="cr-settings-main">	14 <dom-module id="cr-settings-main">

12 <link rel="import" type="css" href="settings_main.css">	15 <link rel="import" type="css" href="settings_main.css">

13 <template>	16 <template>

14 <div id="mainContainer">	17 <div id="mainContainer">

15 <cr-settings-page-header selected-page="[[selectedPage]]">	18 <cr-settings-page-header selected-page="[[selectedPage]]">

16 </cr-settings-page-header>	19 </cr-settings-page-header>

17 <content select="paper-icon-button"></content>	20 <content select="paper-icon-button"></content>

18 <more-route-selector selected-params="{{params}}">	21 <more-route-selector selected-params="{{params}}">

19 <iron-pages id="pageContainer" selected-item="{{selectedPage}}"	22 <iron-pages id="pageContainer" selected-item="{{selectedPage}}"

20 on-iron-select="onIronSelect_" attr-for-selected="PAGE_ID">	23 on-iron-select="onIronSelect_" attr-for-selected="PAGE_ID">

21 <cr-settings-basic-page prefs="{{prefs}}" route="basic">	24 <cr-settings-basic-page prefs="{{prefs}}" route="basic">

22 </cr-settings-basic-page>	25 </cr-settings-basic-page>

23 <cr-settings-advanced-page prefs="{{prefs}}" route="advanced">	26 <cr-settings-advanced-page prefs="{{prefs}}" route="advanced">

24 </cr-settings-advanced-page>	27 </cr-settings-advanced-page>

25 <if expr="chromeos">	28 <if expr="chromeos">

26 <cr-settings-internet-detail-page route="internet-detail"	29 <cr-settings-internet-detail-page route="internet-detail"

27 subpage="true" guid="[[params.guid]]"	30 subpage="true" guid="[[params.guid]]"

28 selected-page="[[selectedPage]]">	31 selected-page="[[selectedPage]]">

29 </cr-settings-internet-detail-page>	32 </cr-settings-internet-detail-page>

30 </if>	33 </if>

31 <cr-settings-search-engines-page route="search-engines">	34 <cr-settings-search-engines-page route="search-engines">

32 </cr-settings-search-engines-page>	35 </cr-settings-search-engines-page>

33 </iron-pages>	36 </iron-pages>

34 </more-route-selector>	37 </more-route-selector>

35 </div>	38 </div>

36 </template>	39 </template>

37 <script src="settings_main.js"></script>	40 <script src="settings_main.js"></script>

38 </dom-module>	41 </dom-module>

OLD	NEW