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

Side by Side Diff: chrome/browser/resources/settings/settings_menu/settings_menu.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: merge upstream changes 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/browser/resources/settings/people_page/sync_private_api.js ('k') | chrome/browser/resources/settings/settings_resources.grd » ('j') | no next file with comments »
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-icon/iron-icon.htm l">	2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l">

3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/device-icons .html">	3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/device-icons .html">

4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/hardware-ico ns.html">	4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/hardware-ico ns.html">

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

6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/social-icons .html">	6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/social-icons .html">

7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-item/paper-icon-i tem.html">	7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-item/paper-icon-i tem.html">

8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-menu.h tml">	8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-menu.h tml">

9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-submen u.html">	9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-submen u.html">

10	10

(...skipping 10 matching lines...) Expand all Loading...
21 <iron-icon icon="expand-more" item-icon></iron-icon>	21 <iron-icon icon="expand-more" item-icon></iron-icon>

22 <span i18n-content="basicPageTitle"></span>	22 <span i18n-content="basicPageTitle"></span>

23 </paper-icon-item>	23 </paper-icon-item>

24 <paper-menu class="menu-content">	24 <paper-menu class="menu-content">

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

26 <paper-icon-item>	26 <paper-icon-item>

27 <iron-icon icon="settings-ethernet" item-icon></iron-icon>	27 <iron-icon icon="settings-ethernet" item-icon></iron-icon>

28 <span i18n-content="internetPageTitle"></span>	28 <span i18n-content="internetPageTitle"></span>

29 </paper-icon-item>	29 </paper-icon-item>

30 </if>	30 </if>

31 <if expr="not chromeos">

32 <paper-icon-item>	31 <paper-icon-item>

33 <iron-icon icon="social:person" item-icon></iron-icon>	32 <iron-icon icon="social:person" item-icon></iron-icon>

34 <span i18n-content="peoplePageTitle"></span>	33 <span i18n-content="peoplePageTitle"></span>

35 </paper-icon-item>	34 </paper-icon-item>

36 </if>

37 <paper-icon-item>	35 <paper-icon-item>

38 <iron-icon icon="home" item-icon></iron-icon>	36 <iron-icon icon="home" item-icon></iron-icon>

39 <span i18n-content="appearancePageTitle"></span>	37 <span i18n-content="appearancePageTitle"></span>

40 </paper-icon-item>	38 </paper-icon-item>

41 <paper-icon-item>	39 <paper-icon-item>

42 <iron-icon icon="image:brightness-1" item-icon></iron-icon>	40 <iron-icon icon="image:brightness-1" item-icon></iron-icon>

43 <span i18n-content="onStartup"></span>	41 <span i18n-content="onStartup"></span>

44 </paper-icon-item>	42 </paper-icon-item>

45 <paper-icon-item>	43 <paper-icon-item>

46 <iron-icon icon="search" item-icon></iron-icon>	44 <iron-icon icon="search" item-icon></iron-icon>

(...skipping 60 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
107 <iron-icon icon="accessibility" item-icon></iron-icon>	105 <iron-icon icon="accessibility" item-icon></iron-icon>

108 <span i18n-content="a11yPageTitle"></span>	106 <span i18n-content="a11yPageTitle"></span>

109 </paper-icon-item>	107 </paper-icon-item>

110 </if>	108 </if>

111 </paper-menu>	109 </paper-menu>

112 </paper-submenu>	110 </paper-submenu>

113 </paper-menu>	111 </paper-menu>

114 </template>	112 </template>

115 <script src="settings_menu.js"></script>	113 <script src="settings_menu.js"></script>

116 </dom-module>	114 </dom-module>

OLD	NEW