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

Side by Side Diff: chrome/browser/resources/settings/people_page/people_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: 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/compiled_resources.gyp ('k') | chrome/browser/resources/settings/people_page/people_page.js » ('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/html/i18n_behavior.html">	1 <link rel="import" href="chrome://resources/html/i18n_behavior.html">

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

3 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">	3 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">

4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">	4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">

5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html">	5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html">

6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-dialog/paper-dial og.html">	6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-dialog/paper-dial og.html">

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

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

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

10 <link rel="import" href="chrome://md-settings/settings_page/settings_subheader.h tml">	10 <link rel="import" href="chrome://md-settings/settings_page/settings_subheader.h tml">

11	11

12 <dom-module id="settings-signin-page">	12 <dom-module id="settings-people-page">

13 <link rel="import" type="css"	13 <link rel="import" type="css"

14 href="chrome://md-settings/settings_shared.css">	14 href="chrome://md-settings/settings_shared.css">

15 <template>	15 <template>

16 <settings-animated-pages id="pages" current-route="{{currentRoute}}"	16 <settings-animated-pages id="pages" current-route="{{currentRoute}}"

17 section="people">	17 section="people">

18 <neon-animatable id="main">	18 <neon-animatable id="main">

19 <div class="settings-box">	19 <div class="settings-box">

20 <div class="split">	20 <div class="split">

21 <span class="start">	21 <span class="start">

22 <!-- TODO(tommycli): Investigate ChromeOS user pictures.	22 <!-- TODO(tommycli): Investigate ChromeOS user pictures.

(...skipping 60 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
83 </if>	83 </if>

84 <div class="button-strip">	84 <div class="button-strip">

85 <paper-button dialog-dismiss i18n-content="cancel">	85 <paper-button dialog-dismiss i18n-content="cancel">

86 </paper-button>	86 </paper-button>

87 <paper-button dialog-confirm raised on-tap="onDisconnectConfirm_"	87 <paper-button dialog-confirm raised on-tap="onDisconnectConfirm_"

88 i18n-content="syncDisconnectConfirm">	88 i18n-content="syncDisconnectConfirm">

89 </paper-button>	89 </paper-button>

90 </div>	90 </div>

91 </paper-dialog>	91 </paper-dialog>

92 </template>	92 </template>

93 <script src="signin_page.js"></script>	93 <script src="people_page.js"></script>

94 </dom-module>	94 </dom-module>

OLD	NEW