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

Unified Diff: chrome/browser/ui/views/frame/browser_view.cc

Issue 1487283005: Implement the new Sync Confirmation dialog on Linux and Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Mac/ChromeOS builds and iOS tests. Created 4 years, 11 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
Index: chrome/browser/ui/views/frame/browser_view.cc
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index adad05ad27d2e48b7bbb3ca873e4a4975b84ee14..2d7a8e089ccc313d358f640e460bb87708fca26b 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -2555,7 +2555,6 @@ void BrowserView::ShowAvatarBubbleFromAvatarButton(
profiles::TutorialMode tutorial_mode;
profiles::BubbleViewModeFromAvatarBubbleMode(mode, &bubble_view_mode,
&tutorial_mode);
-
if (SigninViewController::ShouldShowModalSigninForMode(bubble_view_mode)) {
ShowModalSigninWindow(mode, access_point);
} else {
@@ -2570,6 +2569,10 @@ void BrowserView::ShowAvatarBubbleFromAvatarButton(
#endif
}
+void BrowserView::CloseModalSigninWindow() {
+ signin_view_controller_.CloseModalSignin();
+}
+
void BrowserView::ShowModalSigninWindow(
AvatarBubbleMode mode,
signin_metrics::AccessPoint access_point) {
@@ -2581,8 +2584,8 @@ void BrowserView::ShowModalSigninWindow(
access_point);
}
-void BrowserView::CloseModalSigninWindow() {
- signin_view_controller_.CloseModalSignin();
+void BrowserView::ShowModalSyncConfirmationWindow() {
+ signin_view_controller_.ShowModalSyncConfirmationDialog(browser());
}
int BrowserView::GetRenderViewHeightInsetWithDetachedBookmarkBar() {
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.h ('k') | chrome/browser/ui/views/profiles/profile_chooser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698