Implement the inline signin confirmation bubble and mirror upgrade tutorial

chrome/browser/ui/sync/one_click_signin_sync_starter.cc

Index: chrome/browser/ui/sync/one_click_signin_sync_starter.cc
diff --git a/chrome/browser/ui/sync/one_click_signin_sync_starter.cc b/chrome/browser/ui/sync/one_click_signin_sync_starter.cc
index 8c713f84ed9c102655be49f0ae12b14ba2bd6c0d..b5d0da3b5e08110465e50935e422c880fc4ab340 100644
--- a/chrome/browser/ui/sync/one_click_signin_sync_starter.cc
+++ b/chrome/browser/ui/sync/one_click_signin_sync_starter.cc
@@ -34,7 +34,6 @@
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/sync/one_click_signin_sync_observer.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
-#include "chrome/browser/ui/webui/signin/login_ui_service.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
 #include "chrome/browser/ui/webui/signin/profile_signin_confirmation_dialog.h"
 #include "chrome/common/url_constants.h"
@@ -95,7 +94,7 @@ OneClickSigninSyncStarter::OneClickSigninSyncStarter(
   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
@@ -114,6 +113,7 @@ void OneClickSigninSyncStarter::OnBrowserRemoved(Browser* browser) {
 
 OneClickSigninSyncStarter::~OneClickSigninSyncStarter() {
   BrowserList::RemoveObserver(this);
+  LoginUIServiceFactory::GetForProfile(profile_)->RemoveObserver(this);
 }
 
 void OneClickSigninSyncStarter::Initialize(Profile* profile, Browser* browser) {
@@ -376,6 +376,20 @@ void OneClickSigninSyncStarter::UntrustedSigninConfirmed(
   }
 }
 
+void OneClickSigninSyncStarter::OnSyncConfirmationUIClosed(
+    bool configure_sync_first) {
+  if (configure_sync_first) {
+    ShowSettingsPage(true);
+  } else {
+    ProfileSyncService* profile_sync_service = GetProfileSyncService();
+    if (profile_sync_service)
+      profile_sync_service->SetSyncSetupCompleted();
+    FinishProfileSyncServiceSetup();
+  }
+
+  delete this;
+}

[Roger Tawa OOO till Jul 10th, 2014/08/05 16:02:13]

Are we guaranteed to get this callback?

[guohui, 2014/08/05 19:27:41]

i think yes as long as Chrome shuts down properly. The callback is called in
three cases:

1. user clicks 'ok i got it'
2. user clicks 'settings' link
3. the avatar bubble is closed 

i think the case 3 is guaranteed to happen unless something really bad happens,
thus the callback will be eventually called.

[guohui, 2014/08/06 13:42:52]

eh actually i missed one case =(

The callback will never be called if the bubble is closed before SyncStarter
starts. The bubble is auto closed if it loses focus, and this may happen
accidentally (e.g. user clicks somewhere other than the bubble too quickly), or
if Chrome decides to show a modal confirmation dialog (enterprise and
cross-account) before completing signin.

A possible solution is to ensure the avatar bubble opens the confirmation view
at line 449 below. This is related to the error/warning flows, so i ll handle it
in the next CL.

[Roger Tawa OOO till Jul 10th, 2014/08/06 14:09:41]

You have another bug to make the bubble not auto-close during sign in.  Would
that help as well?  If so, no need to hack some more here.

+
 void OneClickSigninSyncStarter::SigninFailed(
     const GoogleServiceAuthError& error) {
   if (!sync_setup_completed_callback_.is_null())
@@ -431,6 +445,9 @@ void OneClickSigninSyncStarter::MergeSessionComplete(
       }
       break;
     }
+    case CONFIRM_SYNC_SETTINGS_FIRST:
+      // Blocks sync until the sync settings confirmation UI is closed.
+      return;
     case CONFIGURE_SYNC_FIRST:
       ShowSettingsPage(true);  // Show sync config UI.
       break;