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

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

Issue 2102803002: Settings People Revamp: Add special Disconnect logic for domain profiles (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address test feedback Created 4 years, 6 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/app/settings_strings.grdp ('k') | chrome/browser/resources/settings/people_page/people_page.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/settings/people_page/people_page.html
diff --git a/chrome/browser/resources/settings/people_page/people_page.html b/chrome/browser/resources/settings/people_page/people_page.html
index 56dda11a553edd831dc59d6842002eacb1d847c4..331f6225f7e93f3f9f8032728b1e21ae2b18901f 100644
--- a/chrome/browser/resources/settings/people_page/people_page.html
+++ b/chrome/browser/resources/settings/people_page/people_page.html
@@ -4,7 +4,7 @@
<link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-animatable.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-checkbox.html">
-<link rel="import" href="chrome://resources/polymer/v1_0/paper-dialog/paper-dialog.html">
+<link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html">
<link rel="import" href="/controls/settings_checkbox.html">
<link rel="import" href="/people_page/sync_page.html">
<link rel="import" href="/people_page/profile_info_browser_proxy.html">
@@ -99,7 +99,8 @@
</template>
<template is="dom-if" if="[[syncStatus.signedIn]]">
<span class="secondary-action">
- <paper-button class="secondary-button" on-tap="onDisconnectTap_"
+ <paper-button id="disconnectButton" class="secondary-button"
+ on-tap="onDisconnectTap_"
disabled="[[syncStatus.setupInProgress]]">
$i18n{syncDisconnect}
</paper-button>
@@ -259,22 +260,29 @@
</if>
</settings-animated-pages>
- <paper-dialog modal id="disconnectDialog">
- <h2>$i18n{syncDisconnectTitle}</h2>
- <div>$i18nRaw{syncDisconnectExplanation}</div>
-<if expr="(not chromeos and is_posix) or is_win or is_macosx">
- <paper-checkbox id="deleteProfile">
- $i18n{syncDisconnectDeleteProfile}
- </paper-checkbox>
-</if>
- <div class="button-strip">
- <paper-button dialog-dismiss>$i18n{cancel}</paper-button>
- <paper-button dialog-confirm class="action-button"
- on-tap="onDisconnectConfirm_">
+ <cr-dialog id="disconnectDialog">
+ <div class="title">$i18n{syncDisconnectTitle}</div>
+ <div class="body">
+ <div inner-h-t-m-l="[[getDisconnectExplanationHtml_(syncStatus.domain)]]">
+ </div>
+ <if expr="(not chromeos and is_posix) or is_win or is_macosx">
+ <paper-checkbox id="deleteProfile" hidden=[[syncStatus.domain]]>
+ $i18n{syncDisconnectDeleteProfile}
+ </paper-checkbox>
+ </if>
+ </div>
+ <div class="button-container">
+ <paper-button on-tap="onDisconnectCancel_">$i18n{cancel}</paper-button>
+ <paper-button id="disconnectConfirm" class="action-button"
+ hidden=[[syncStatus.domain]] on-tap="onDisconnectConfirm_">
+ $i18n{syncDisconnect}
+ </paper-button>
+ <paper-button id="disconnectManagedProfileConfirm" class="action-button"
+ hidden=[[!syncStatus.domain]] on-tap="onDisconnectConfirm_">
$i18n{syncDisconnectConfirm}
</paper-button>
</div>
- </paper-dialog>
+ </cr-dialog>
<if expr="chromeos">
<template is="dom-if" if="[[easyUnlockEnabled_]]">
« no previous file with comments | « chrome/app/settings_strings.grdp ('k') | chrome/browser/resources/settings/people_page/people_page.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698