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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/resources/settings/basic_page/basic_page.html

Issue 1381553003: Settings Rewrite: Add Sign-in (Chrome) section (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 months 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
« no previous file with comments | « chrome/browser/resources/settings/advanced_page/advanced_page.html ('k') | chrome/browser/resources/settings/settings_menu/settings_menu.html » ('j') | chrome/browser/resources/settings/settings_page/settings_router.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 0bf22192dba4d3f2fd097384871fa02e428daf6b..2746055c61deb731d9d6da0ecedc46d001900cf2 100644
--- a/chrome/browser/resources/settings/basic_page/basic_page.html
+++ b/chrome/browser/resources/settings/basic_page/basic_page.html
@@ -1,5 +1,4 @@
<link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">
-<link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/image-icons.html">
<link rel="import" href="chrome://md-settings/appearance_page/appearance_page.html">
<link rel="import" href="chrome://md-settings/search_page/search_page.html">
<link rel="import" href="chrome://md-settings/settings_page/settings_section.html">
@@ -10,9 +9,21 @@
<link rel="import" href="chrome://md-settings/users_page/users_page.html">
</if>
+<if expr="not chromeos">
+<link rel="import" href="chrome://md-settings/signin_page/signin_page.html">
+</if>
+
<dom-module id="cr-settings-basic-page">
<link rel="import" type="css" href="basic_page.css">
<template>
+<if expr="not chromeos">
+ <cr-settings-section i18n-values="page-title:signinPageTitle"
+ expand-container="[[expandContainer]]"
+ current-route="[[currentRoute]]" section="signin">
+ <cr-settings-signin-page current-route="{{currentRoute}}">
+ </cr-settings-signin-page>
+ </cr-settings-section>
+</if>
<if expr="chromeos">
<cr-settings-section i18n-values="page-title:internetPageTitle"
expand-container="[[expandContainer]]"
« no previous file with comments | « chrome/browser/resources/settings/advanced_page/advanced_page.html ('k') | chrome/browser/resources/settings/settings_menu/settings_menu.html » ('j') | chrome/browser/resources/settings/settings_page/settings_router.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698