Make sure the new confirmation bubble is always shown upon signin

chrome/browser/ui/sync/one_click_signin_sync_starter.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/sync/one_click_signin_sync_starter.h"
 
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 66 matching lines @@
     Browser* browser,
     const std::string& email,
     const std::string& password,
     const std::string& refresh_token,
     StartSyncMode start_mode,
     content::WebContents* web_contents,
     ConfirmationRequired confirmation_required,
     const GURL& continue_url,
     Callback sync_setup_completed_callback)
     : content::WebContentsObserver(web_contents),
+      profile_(NULL),
       start_mode_(start_mode),
       desktop_type_(chrome::HOST_DESKTOP_TYPE_NATIVE),
       confirmation_required_(confirmation_required),
       continue_url_(continue_url),
       sync_setup_completed_callback_(sync_setup_completed_callback),
       weak_pointer_factory_(this) {
   DCHECK(profile);
   DCHECK(web_contents || continue_url.is_empty());
   BrowserList::AddObserver(this);
-  LoginUIServiceFactory::GetForProfile(profile)->AddObserver(this);
   Initialize(profile, browser);
 
   // Policy is enabled, so pass in a callback to do extra policy-related UI
   // before signin completes.
   SigninManagerFactory::GetForProfile(profile_)->
       StartSignInWithRefreshToken(
           refresh_token, email, password,
           base::Bind(&OneClickSigninSyncStarter::ConfirmSignin,
                      weak_pointer_factory_.GetWeakPtr()));
 }
 
 void OneClickSigninSyncStarter::OnBrowserRemoved(Browser* browser) {
   if (browser == browser_)
     browser_ = NULL;
 }
 
 OneClickSigninSyncStarter::~OneClickSigninSyncStarter() {
   BrowserList::RemoveObserver(this);
   LoginUIServiceFactory::GetForProfile(profile_)->RemoveObserver(this);
 }
 
 void OneClickSigninSyncStarter::Initialize(Profile* profile, Browser* browser) {
   DCHECK(profile);
+
+  if (profile_)
+    LoginUIServiceFactory::GetForProfile(profile_)->RemoveObserver(this);
+
   profile_ = profile;
   browser_ = browser;
 
+  LoginUIServiceFactory::GetForProfile(profile_)->AddObserver(this);
+
   // Cache the parent desktop for the browser, so we can reuse that same
   // desktop for any UI we want to display.
   if (browser) {
     desktop_type_ = browser->host_desktop_type();
   } else {
     desktop_type_ = chrome::GetActiveDesktop();
   }
 
   signin_tracker_ = SigninTrackerFactory::CreateForProfile(profile_, this);
 
@@ skipping 45 matching lines @@
 
 void OneClickSigninSyncStarter::SigninDialogDelegate::OnCancelSignin() {
   SetUserChoiceHistogram(SIGNIN_CHOICE_CANCEL);
   if (sync_starter_ != NULL)
     sync_starter_->CancelSigninAndDelete();
 }
 
 void OneClickSigninSyncStarter::SigninDialogDelegate::OnContinueSignin() {
   SetUserChoiceHistogram(SIGNIN_CHOICE_CONTINUE);
 
-  if (sync_starter_ != NULL) {
-    // If the user signs in from the new avatar bubble, the enterprise
-    // confirmation dialog would dismiss the avatar bubble, thus it won't show
-    // any confirmation upon sign in completes. This cofirmation dialog already
-    // mentions that user data would be synced, thus we just start sync
-    // immediately.
-
-    // TODO(guohui): add a sync settings link to allow user to configure sync
-    // settings before sync starts.
-    if (sync_starter_->GetStartSyncMode() == CONFIRM_SYNC_SETTINGS_FIRST)
-      sync_starter_->SetStartSyncMode(SYNC_WITH_DEFAULT_SETTINGS);
+  if (sync_starter_ != NULL)
     sync_starter_->LoadPolicyWithCachedCredentials();
-  }
 }
 
 void OneClickSigninSyncStarter::SigninDialogDelegate::OnSigninWithNewProfile() {
   SetUserChoiceHistogram(SIGNIN_CHOICE_NEW_PROFILE);
 
-  if (sync_starter_ != NULL) {
-    // TODO(guohui): add a sync settings link to allow user to configure sync
-    // settings before sync starts.
-    if (sync_starter_->GetStartSyncMode() == CONFIRM_SYNC_SETTINGS_FIRST)
-      sync_starter_->SetStartSyncMode(SYNC_WITH_DEFAULT_SETTINGS);
+  if (sync_starter_ != NULL)
     sync_starter_->CreateNewSignedInProfile();
-  }
-}
-
-void OneClickSigninSyncStarter::SetStartSyncMode(StartSyncMode start_mode) {
-  start_mode_ = start_mode;
-}
-
-OneClickSigninSyncStarter::StartSyncMode
-    OneClickSigninSyncStarter::GetStartSyncMode() {
-  return start_mode_;
 }
 
 void OneClickSigninSyncStarter::OnRegisteredForPolicy(
     const std::string& dm_token, const std::string& client_id) {
   SigninManager* signin = SigninManagerFactory::GetForProfile(profile_);
   // If there's no token for the user (policy registration did not succeed) just
   // finish signing in.
   if (dm_token.empty()) {
     DVLOG(1) << "Policy registration failed";
     ConfirmAndSignin();
@@ skipping 243 matching lines @@
           // Sync is disabled by policy.
           message = l10n_util::GetStringUTF16(
               IDS_ONE_CLICK_SIGNIN_BUBBLE_SYNC_DISABLED_MESSAGE);
         }
         DisplayFinalConfirmationBubble(message);
       }
       break;
     }
     case CONFIRM_SYNC_SETTINGS_FIRST:
       // Blocks sync until the sync settings confirmation UI is closed.
+      DisplayFinalConfirmationBubble(base::string16());
       return;
     case CONFIGURE_SYNC_FIRST:
       ShowSettingsPage(true);  // Show sync config UI.
       break;
     case SHOW_SETTINGS_WITHOUT_CONFIGURE:
       ShowSettingsPage(false);  // Don't show sync config UI.
       break;
     case UNDO_SYNC:
       NOTREACHED();
   }
 
   // Navigate to the |continue_url_| if one is set, unless the user first needs
   // to configure Sync.
   if (web_contents() && !continue_url_.is_empty() &&
       start_mode_ != CONFIGURE_SYNC_FIRST) {
     LoadContinueUrl();
   }
 
   delete this;
 }
 
 void OneClickSigninSyncStarter::DisplayFinalConfirmationBubble(
     const base::string16& custom_message) {
   browser_ = EnsureBrowser(browser_, profile_, desktop_type_);
+  // Show the success confirmation message in the new avatar menu if it is
+  // enabled.
+  // TODO(guohui): needs to handle custom messages.
+  if (custom_message.empty() && switches::IsNewAvatarMenu()) {
+    browser_->window()->ShowAvatarBubbleFromAvatarButton(
+        BrowserWindow::AVATAR_BUBBLE_MODE_CONFIRM_SIGNIN,
+        signin::ManageAccountsParams());
+    return;
+  }
+
   browser_->window()->ShowOneClickSigninBubble(
       BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_BUBBLE,
       base::string16(),  // No email required - this is not a SAML confirmation.
       custom_message,
       // Callback is ignored.
       BrowserWindow::StartSyncCallback());
 }
 
 // static
 Browser* OneClickSigninSyncStarter::EnsureBrowser(
@@ skipping 113 matching lines @@
                                             false /* user_gesture */);
 }
 
 void OneClickSigninSyncStarter::LoadContinueUrl() {
   web_contents()->GetController().LoadURL(
       continue_url_,
       content::Referrer(),
       content::PAGE_TRANSITION_AUTO_TOPLEVEL,
       std::string());
 }