chrome/browser/resources/settings/basic_page/basic_page.html - Issue 1358313004: Settings Rewrite: Make subpage scrolling work.

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

Issue 1358313004: Settings Rewrite: Make subpage scrolling work. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

« no previous file with comments | « chrome/browser/resources/settings/basic_page/basic_page.css ('k') | chrome/browser/resources/settings/settings_main/settings_main.css » ('j') | chrome/browser/resources/settings/settings_page/settings_section.js » ('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-icons/image-icons. html">	2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/image-icons. 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/settings_section.htm l">	5 <link rel="import" href="chrome://md-settings/settings_page/settings_section.htm l">

6 <link rel="import" href="chrome://md-settings/on_startup_page/on_startup_page.ht ml">	6 <link rel="import" href="chrome://md-settings/on_startup_page/on_startup_page.ht ml">

7	7

8 <if expr="chromeos">	8 <if expr="chromeos">

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

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

11 </if>	11 </if>

12	12

13 <dom-module id="cr-settings-basic-page">	13 <dom-module id="cr-settings-basic-page">

	14 <link rel="import" type="css" href="basic_page.css">

14 <template>	15 <template>

15 <if expr="chromeos">	16 <if expr="chromeos">

16 <cr-settings-section i18n-values="page-title:internetPageTitle"	17 <cr-settings-section i18n-values="page-title:internetPageTitle"

17 expand-container="{{expandContainer}}"	18 expand-container="[[expandContainer]]"

18 current-route="[[currentRoute]]" section="internet">	19 current-route="[[currentRoute]]" section="internet">

19 <cr-settings-internet-page current-route="{{currentRoute}}">	20 <cr-settings-internet-page current-route="{{currentRoute}}">

20 </cr-settings-internet-page>	21 </cr-settings-internet-page>

21 </cr-settings-section>	22 </cr-settings-section>

22 </if>	23 </if>

23 <cr-settings-section i18n-values="page-title:appearancePageTitle"	24 <cr-settings-section i18n-values="page-title:appearancePageTitle"

24 expand-container="{{expandContainer}}"	25 expand-container="[[expandContainer]]"

25 current-route="[[currentRoute]]" section="appearance">	26 current-route="[[currentRoute]]" section="appearance">

26 <cr-settings-appearance-page prefs="{{prefs}}">	27 <cr-settings-appearance-page prefs="{{prefs}}">

27 </cr-settings-appearance-page>	28 </cr-settings-appearance-page>

28 </cr-settings-section>	29 </cr-settings-section>

29	30

30 <cr-settings-section i18n-values="page-title:onStartup"	31 <cr-settings-section i18n-values="page-title:onStartup"

31 expand-container="{{expandContainer}}"	32 expand-container="[[expandContainer]]"

32 current-route="[[currentRoute]]" section="on-startup">	33 current-route="[[currentRoute]]" section="on-startup">

33 <cr-settings-on-startup-page	34 <cr-settings-on-startup-page

34 prefs="{{prefs}}" current-route="{{currentRoute}}">	35 prefs="{{prefs}}" current-route="{{currentRoute}}">

35 </cr-settings-on-startup-page>	36 </cr-settings-on-startup-page>

36 </cr-settings-section>	37 </cr-settings-section>

37	38

38 <cr-settings-section i18n-values="page-title:searchPageTitle"	39 <cr-settings-section i18n-values="page-title:searchPageTitle"

39 expand-container="{{expandContainer}}"	40 expand-container="[[expandContainer]]"

40 current-route="[[currentRoute]]" section="search">	41 current-route="[[currentRoute]]" section="search">

41 <cr-settings-search-page current-route="{{currentRoute}}">	42 <cr-settings-search-page current-route="{{currentRoute}}">

42 </cr-settings-search-page>	43 </cr-settings-search-page>

43 </cr-settings-section>	44 </cr-settings-section>

44	45

45 <if expr="chromeos">	46 <if expr="chromeos">

46 <cr-settings-section i18n-values="page-title:usersPageTitle"	47 <cr-settings-section i18n-values="page-title:usersPageTitle"

47 expand-container="{{expandContainer}}"	48 expand-container="[[expandContainer]]"

48 current-route="[[currentRoute]]" section="users">	49 current-route="[[currentRoute]]" section="users">

49 <cr-settings-users-page prefs="{{prefs}}"></cr-settings-users-page>	50 <cr-settings-users-page prefs="{{prefs}}"></cr-settings-users-page>

50 </cr-settings-section>	51 </cr-settings-section>

51 </if>	52 </if>

52 </template>	53 </template>

53 <script src="basic_page.js"></script>	54 <script src="basic_page.js"></script>

54 </dom-module>	55 </dom-module>

OLD	NEW