chrome/browser/resources/settings/basic_page/basic_page.html - Issue 1503333003: Settings People Rewrite: Make Sync/Sign-in naming consistent to People.

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

Issue 1503333003: Settings People Rewrite: Make Sync/Sign-in naming consistent to People. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix an egreious git cl format error 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 | « chrome/app/settings_strings.grdp ('k') | chrome/browser/resources/settings/people_page/compiled_resources.gyp » ('j') | chrome/browser/ui/webui/settings/people_handler.cc » ('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	7

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

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

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

10 </if>	11 </if>

11	12

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

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

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

15 </if>	15 </if>

16	16

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

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

19 <template>	19 <template>

20 <if expr="not chromeos">

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

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

23 <settings-signin-page current-route="{{currentRoute}}">	22 <settings-people-page current-route="{{currentRoute}}">

24 </settings-signin-page>	23 </settings-people-page>

25 </settings-section>	24 </settings-section>

26 </if>

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

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

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

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

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

32 </settings-section>	30 </settings-section>

33 </if>	31 </if>

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

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

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

(...skipping 25 matching lines...) Expand all Loading...
62 <settings-section i18n-values="page-title:defaultBrowser"	60 <settings-section i18n-values="page-title:defaultBrowser"

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

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

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

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

67 </settings-section>	65 </settings-section>

68 </if>	66 </if>

69 </template>	67 </template>

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

71 </dom-module>	69 </dom-module>

OLD	NEW