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

Unified Diff: chrome/browser/profiles/profile_window.cc

Issue 471023003: Make sure the new confirmation bubble is always shown upon signin (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 6 years, 4 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/profiles/profile_window.h ('k') | chrome/browser/ui/browser_window.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/profile_window.cc
diff --git a/chrome/browser/profiles/profile_window.cc b/chrome/browser/profiles/profile_window.cc
index 928f44839afccd94668a717b87f17813743717be..7e88d0ccaa7484da45b2b624dd6bce9aae356c15 100644
--- a/chrome/browser/profiles/profile_window.cc
+++ b/chrome/browser/profiles/profile_window.cc
@@ -350,22 +350,31 @@ void DisableNewProfileManagementPreview(Profile* profile) {
UpdateServicesWithNewProfileManagementFlag(profile, false);
}
-BubbleViewMode BubbleViewModeFromAvatarBubbleMode(
- BrowserWindow::AvatarBubbleMode mode) {
+void BubbleViewModeFromAvatarBubbleMode(
+ BrowserWindow::AvatarBubbleMode mode,
+ BubbleViewMode* bubble_view_mode,
+ TutorialMode* tutorial_mode) {
+ *tutorial_mode = TUTORIAL_MODE_NONE;
switch (mode) {
case BrowserWindow::AVATAR_BUBBLE_MODE_ACCOUNT_MANAGEMENT:
- return profiles::BUBBLE_VIEW_MODE_ACCOUNT_MANAGEMENT;
+ *bubble_view_mode = BUBBLE_VIEW_MODE_ACCOUNT_MANAGEMENT;
+ return;
case BrowserWindow::AVATAR_BUBBLE_MODE_SIGNIN:
- return profiles::BUBBLE_VIEW_MODE_GAIA_SIGNIN;
+ *bubble_view_mode = BUBBLE_VIEW_MODE_GAIA_SIGNIN;
+ return;
case BrowserWindow::AVATAR_BUBBLE_MODE_ADD_ACCOUNT:
- return profiles::BUBBLE_VIEW_MODE_GAIA_ADD_ACCOUNT;
+ *bubble_view_mode = BUBBLE_VIEW_MODE_GAIA_ADD_ACCOUNT;
+ return;
case BrowserWindow::AVATAR_BUBBLE_MODE_REAUTH:
- return profiles::BUBBLE_VIEW_MODE_GAIA_REAUTH;
- case BrowserWindow::AVATAR_BUBBLE_MODE_DEFAULT:
- return profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER;
+ *bubble_view_mode = BUBBLE_VIEW_MODE_GAIA_REAUTH;
+ return;
+ case BrowserWindow::AVATAR_BUBBLE_MODE_CONFIRM_SIGNIN:
+ *bubble_view_mode = BUBBLE_VIEW_MODE_PROFILE_CHOOSER;
+ *tutorial_mode = TUTORIAL_MODE_CONFIRM_SIGNIN;
+ return;
+ default:
+ *bubble_view_mode = profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER;
}
- NOTREACHED();
- return profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER;
}
} // namespace profiles
« no previous file with comments | « chrome/browser/profiles/profile_window.h ('k') | chrome/browser/ui/browser_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698