chrome/browser/resources/settings/basic_page/basic_page.html - Issue 1503403004: Settings People Rewrite: Move users_page as subpage of People.

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

Issue 1503403004: Settings People Rewrite: Move users_page as subpage of People. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@0053-people-rename-a-bunch-of-stuff

Patch Set: Created 5 years 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 | « no previous file | chrome/browser/resources/settings/people_page/people_page.html » ('j') | chrome/browser/resources/settings/settings_page/settings_router.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://md-settings/appearance_page/appearance_page.ht ml">	2 <link rel="import" href="chrome://md-settings/appearance_page/appearance_page.ht ml">

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

4 <link rel="import" href="chrome://md-settings/settings_page/settings_section.htm l">	4 <link rel="import" href="chrome://md-settings/settings_page/settings_section.htm l">

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

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

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">

11 </if>	10 </if>

12	11

13 <if expr="not chromeos">	12 <if expr="not chromeos">

14 <link rel="import" href="chrome://md-settings/default_browser_page/default_brows er_page.html">	13 <link rel="import" href="chrome://md-settings/default_browser_page/default_brows er_page.html">

15 </if>	14 </if>

16	15

17 <dom-module id="settings-basic-page">	16 <dom-module id="settings-basic-page">

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

19 <template>	18 <template>

20 <settings-section i18n-values="page-title:peoplePageTitle"	19 <settings-section i18n-values="page-title:peoplePageTitle"

21 current-route="[[currentRoute]]" section="people">	20 current-route="[[currentRoute]]" section="people">

22 <settings-people-page current-route="{{currentRoute}}">	21 <settings-people-page prefs="{{prefs}}" current-route="{{currentRoute}}">

23 </settings-people-page>	22 </settings-people-page>

24 </settings-section>	23 </settings-section>

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

26 <settings-section i18n-values="page-title:internetPageTitle"	25 <settings-section i18n-values="page-title:internetPageTitle"

27 current-route="[[currentRoute]]" section="internet">	26 current-route="[[currentRoute]]" section="internet">

28 <settings-internet-page current-route="{{currentRoute}}">	27 <settings-internet-page current-route="{{currentRoute}}">

29 </settings-internet-page>	28 </settings-internet-page>

30 </settings-section>	29 </settings-section>

31 </if>	30 </if>

32 <settings-section i18n-values="page-title:appearancePageTitle"	31 <settings-section i18n-values="page-title:appearancePageTitle"

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

34 <settings-appearance-page prefs="{{prefs}}"	33 <settings-appearance-page prefs="{{prefs}}"

35 current-route="[[currentRoute]]">	34 current-route="[[currentRoute]]">

36 </settings-appearance-page>	35 </settings-appearance-page>

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

38	37

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

40 current-route="[[currentRoute]]" section="on-startup">	39 current-route="[[currentRoute]]" section="on-startup">

41 <settings-on-startup-page prefs="{{prefs}}"	40 <settings-on-startup-page prefs="{{prefs}}"

42 current-route="{{currentRoute}}">	41 current-route="{{currentRoute}}">

43 </settings-on-startup-page>	42 </settings-on-startup-page>

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

45	44

46 <settings-section i18n-values="page-title:searchPageTitle"	45 <settings-section i18n-values="page-title:searchPageTitle"

47 current-route="[[currentRoute]]" section="search">	46 current-route="[[currentRoute]]" section="search">

48 <settings-search-page current-route="{{currentRoute}}">	47 <settings-search-page current-route="{{currentRoute}}">

49 </settings-search-page>	48 </settings-search-page>

50 </settings-section>	49 </settings-section>

51	50

52 <if expr="chromeos">

53 <settings-section i18n-values="page-title:usersPageTitle"

54 current-route="[[currentRoute]]" section="users">

55 <settings-users-page prefs="{{prefs}}"></settings-users-page>

56 </settings-section>

57 </if>

58

59 <if expr="not chromeos">	51 <if expr="not chromeos">

60 <settings-section i18n-values="page-title:defaultBrowser"	52 <settings-section i18n-values="page-title:defaultBrowser"

61 expand-container="{{expandContainer}}"	53 expand-container="{{expandContainer}}"

62 current-route="[[currentRoute]]" section="defaultBrowser">	54 current-route="[[currentRoute]]" section="defaultBrowser">

63 <settings-default-browser-page>	55 <settings-default-browser-page>

64 </settings-default-browser-page>	56 </settings-default-browser-page>

65 </settings-section>	57 </settings-section>

66 </if>	58 </if>

67 </template>	59 </template>

68 <script src="basic_page.js"></script>	60 <script src="basic_page.js"></script>

69 </dom-module>	61 </dom-module>

OLD	NEW