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

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: Move strings to resources and properly enable the settings link. 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/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 08d9722429b99133460ec0864c87c0a2a0d22770..4e12a78a1d40ee49cc171eacf732f9fa7cbd3256 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -2562,7 +2562,6 @@ void BrowserView::ShowAvatarBubbleFromAvatarButton(
profiles::TutorialMode tutorial_mode;
profiles::BubbleViewModeFromAvatarBubbleMode(mode, &bubble_view_mode,
&tutorial_mode);
-
if (SigninViewController::ShouldShowModalSigninForMode(bubble_view_mode)) {
ShowModalSigninWindow(mode);
} else {
@@ -2577,6 +2576,10 @@ void BrowserView::ShowAvatarBubbleFromAvatarButton(
#endif
}
+void BrowserView::CloseModalSigninWindow() {
+ signin_view_controller_.CloseModalSignin();
+}
+
void BrowserView::ShowModalSigninWindow(AvatarBubbleMode mode) {
profiles::BubbleViewMode bubble_view_mode;
profiles::TutorialMode tutorial_mode;
@@ -2585,8 +2588,8 @@ void BrowserView::ShowModalSigninWindow(AvatarBubbleMode mode) {
signin_view_controller_.ShowModalSignin(bubble_view_mode, browser());
}
-void BrowserView::CloseModalSigninWindow() {
- signin_view_controller_.CloseModalSignin();
+void BrowserView::ShowModalSyncConfirmationWindow() {
+ signin_view_controller_.ShowModalSyncConfirmationDialog(browser());
}
int BrowserView::GetRenderViewHeightInsetWithDetachedBookmarkBar() {

Powered by Google App Engine
This is Rietveld 408576698