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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/settings/basic_page/basic_page.html
diff --git a/chrome/browser/resources/settings/basic_page/basic_page.html b/chrome/browser/resources/settings/basic_page/basic_page.html
index c97f4aba1e212acc5935425a101b7c6610e08170..4a7ac47ac977caa0fc826d65088a88e576254a48 100644
--- a/chrome/browser/resources/settings/basic_page/basic_page.html
+++ b/chrome/browser/resources/settings/basic_page/basic_page.html
@@ -4,6 +4,7 @@
<link rel="import" href="chrome://md-settings/settings_page/settings_page_visibility.html">
<link rel="import" href="chrome://md-settings/settings_page/settings_section.html">
<link rel="import" href="chrome://md-settings/on_startup_page/on_startup_page.html">
+<link rel="import" href="chrome://md-settings/people_page/people_page.html">
<if expr="chromeos">
<link rel="import" href="chrome://md-settings/internet_page/internet_page.html">
@@ -12,21 +13,18 @@
<if expr="not chromeos">
<link rel="import" href="chrome://md-settings/default_browser_page/default_browser_page.html">
-<link rel="import" href="chrome://md-settings/signin_page/signin_page.html">
</if>
<dom-module id="settings-basic-page">
<link rel="import" type="css" href="basic_page.css">
<template>
-<if expr="not chromeos">
<template is="dom-if" if="[[showPage(pageVisibility.people)]]" restamp>
<settings-section i18n-values="page-title:peoplePageTitle"
current-route="[[currentRoute]]" section="people">
- <settings-signin-page current-route="{{currentRoute}}">
- </settings-signin-page>
+ <settings-people-page current-route="{{currentRoute}}">
+ </settings-people-page>
</settings-section>
</template>
-</if>
<if expr="chromeos">
<template is="dom-if" if="[[showPage(pageVisibility.internet)]]" restamp>
<settings-section i18n-values="page-title:internetPageTitle"
« 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