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

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') | 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 <link rel="import" href="chrome://md-settings/people_page/people_page.html">
8 8
9 <if expr="chromeos"> 9 <if expr="chromeos">
10 <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">
11 <link rel="import" href="chrome://md-settings/users_page/users_page.html">
12 </if> 11 </if>
13 12
14 <if expr="not chromeos"> 13 <if expr="not chromeos">
15 <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">
16 </if> 15 </if>
17 16
18 <dom-module id="settings-basic-page"> 17 <dom-module id="settings-basic-page">
19 <link rel="import" type="css" href="basic_page.css"> 18 <link rel="import" type="css" href="basic_page.css">
20 <template> 19 <template>
21 <template is="dom-if" if="[[showPage(pageVisibility.people)]]" restamp> 20 <template is="dom-if" if="[[showPage(pageVisibility.people)]]" restamp>
22 <settings-section i18n-values="page-title:peoplePageTitle" 21 <settings-section i18n-values="page-title:peoplePageTitle"
23 current-route="[[currentRoute]]" section="people"> 22 current-route="[[currentRoute]]" section="people">
24 <settings-people-page current-route="{{currentRoute}}"> 23 <settings-people-page prefs="{{prefs}}" current-route="{{currentRoute}}" >
25 </settings-people-page> 24 </settings-people-page>
26 </settings-section> 25 </settings-section>
27 </template> 26 </template>
28 <if expr="chromeos"> 27 <if expr="chromeos">
29 <template is="dom-if" if="[[showPage(pageVisibility.internet)]]" restamp> 28 <template is="dom-if" if="[[showPage(pageVisibility.internet)]]" restamp>
30 <settings-section i18n-values="page-title:internetPageTitle" 29 <settings-section i18n-values="page-title:internetPageTitle"
31 current-route="[[currentRoute]]" section="internet"> 30 current-route="[[currentRoute]]" section="internet">
32 <settings-internet-page current-route="{{currentRoute}}"> 31 <settings-internet-page current-route="{{currentRoute}}">
33 </settings-internet-page> 32 </settings-internet-page>
34 </settings-section> 33 </settings-section>
(...skipping 15 matching lines...) Expand all
50 </settings-on-startup-page> 49 </settings-on-startup-page>
51 </settings-section> 50 </settings-section>
52 </template> 51 </template>
53 <template is="dom-if" if="[[showPage(pageVisibility.search)]]" restamp> 52 <template is="dom-if" if="[[showPage(pageVisibility.search)]]" restamp>
54 <settings-section i18n-values="page-title:searchPageTitle" 53 <settings-section i18n-values="page-title:searchPageTitle"
55 current-route="[[currentRoute]]" section="search"> 54 current-route="[[currentRoute]]" section="search">
56 <settings-search-page current-route="{{currentRoute}}"> 55 <settings-search-page current-route="{{currentRoute}}">
57 </settings-search-page> 56 </settings-search-page>
58 </settings-section> 57 </settings-section>
59 </template> 58 </template>
60 <if expr="chromeos">
61 <template is="dom-if" if="[[showPage(pageVisibility.users)]]" restamp>
62 <settings-section i18n-values="page-title:usersPageTitle"
63 current-route="[[currentRoute]]" section="users">
64 <settings-users-page prefs="{{prefs}}"></settings-users-page>
65 </settings-section>
66 </template>
67 </if>
68
69 <if expr="not chromeos"> 59 <if expr="not chromeos">
70 <template is="dom-if" if="[[showPage(pageVisibility.defaultBrowser)]]" 60 <template is="dom-if" if="[[showPage(pageVisibility.defaultBrowser)]]"
71 restamp> 61 restamp>
72 <settings-section i18n-values="page-title:defaultBrowser" 62 <settings-section i18n-values="page-title:defaultBrowser"
73 expand-container="{{expandContainer}}" 63 expand-container="{{expandContainer}}"
74 current-route="[[currentRoute]]" section="defaultBrowser"> 64 current-route="[[currentRoute]]" section="defaultBrowser">
75 <settings-default-browser-page> 65 <settings-default-browser-page>
76 </settings-default-browser-page> 66 </settings-default-browser-page>
77 </settings-section> 67 </settings-section>
78 </template> 68 </template>
79 </if> 69 </if>
80 </template> 70 </template>
81 <script src="basic_page.js"></script> 71 <script src="basic_page.js"></script>
82 </dom-module> 72 </dom-module>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/settings/people_page/people_page.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698