Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(63)

Issues Search
    My Issues | Starred     Open | Closed | All

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: 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/app/settings_strings.grdp ('k') | chrome/browser/resources/settings/people_page/compiled_resources.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_page_visibi lity.html"> 4 <link rel="import" href="chrome://md-settings/settings_page/settings_page_visibi lity.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 <link rel="import" href="chrome://md-settings/people_page/people_page.html">
7 8
8 <if expr="chromeos"> 9 <if expr="chromeos">
9 <link rel="import" href="chrome://md-settings/internet_page/internet_page.html"> 10 <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 <link rel="import" href="chrome://md-settings/users_page/users_page.html">
11 </if> 12 </if>
12 13
13 <if expr="not chromeos"> 14 <if expr="not chromeos">
14 <link rel="import" href="chrome://md-settings/default_browser_page/default_brows er_page.html"> 15 <link rel="import" href="chrome://md-settings/default_browser_page/default_brows er_page.html">
15 <link rel="import" href="chrome://md-settings/signin_page/signin_page.html">
16 </if> 16 </if>
17 17
18 <dom-module id="settings-basic-page"> 18 <dom-module id="settings-basic-page">
19 <link rel="import" type="css" href="basic_page.css"> 19 <link rel="import" type="css" href="basic_page.css">
20 <template> 20 <template>
21 <if expr="not chromeos">
22 <template is="dom-if" if="[[showPage(pageVisibility.people)]]" restamp> 21 <template is="dom-if" if="[[showPage(pageVisibility.people)]]" restamp>
23 <settings-section i18n-values="page-title:peoplePageTitle" 22 <settings-section i18n-values="page-title:peoplePageTitle"
24 current-route="[[currentRoute]]" section="people"> 23 current-route="[[currentRoute]]" section="people">
25 <settings-signin-page current-route="{{currentRoute}}"> 24 <settings-people-page current-route="{{currentRoute}}">
26 </settings-signin-page> 25 </settings-people-page>
27 </settings-section> 26 </settings-section>
28 </template> 27 </template>
29 </if>
30 <if expr="chromeos"> 28 <if expr="chromeos">
31 <template is="dom-if" if="[[showPage(pageVisibility.internet)]]" restamp> 29 <template is="dom-if" if="[[showPage(pageVisibility.internet)]]" restamp>
32 <settings-section i18n-values="page-title:internetPageTitle" 30 <settings-section i18n-values="page-title:internetPageTitle"
33 current-route="[[currentRoute]]" section="internet"> 31 current-route="[[currentRoute]]" section="internet">
34 <settings-internet-page current-route="{{currentRoute}}"> 32 <settings-internet-page current-route="{{currentRoute}}">
35 </settings-internet-page> 33 </settings-internet-page>
36 </settings-section> 34 </settings-section>
37 </template> 35 </template>
38 </if> 36 </if>
39 <template is="dom-if" if="[[showPage(pageVisibility.appearance)]]" restamp> 37 <template is="dom-if" if="[[showPage(pageVisibility.appearance)]]" restamp>
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 expand-container="{{expandContainer}}" 73 expand-container="{{expandContainer}}"
76 current-route="[[currentRoute]]" section="defaultBrowser"> 74 current-route="[[currentRoute]]" section="defaultBrowser">
77 <settings-default-browser-page> 75 <settings-default-browser-page>
78 </settings-default-browser-page> 76 </settings-default-browser-page>
79 </settings-section> 77 </settings-section>
80 </template> 78 </template>
81 </if> 79 </if>
82 </template> 80 </template>
83 <script src="basic_page.js"></script> 81 <script src="basic_page.js"></script>
84 </dom-module> 82 </dom-module>
OLDNEW
« no previous file with comments | « chrome/app/settings_strings.grdp ('k') | chrome/browser/resources/settings/people_page/compiled_resources.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698