Refactor LoginUIService to not rely on WebUI.

chrome/browser/ui/webui/sync_setup_handler.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/webui/sync_setup_handler.h"
 
 #include "base/bind.h"
 #include "base/basictypes.h"
 #include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
@@ skipping 403 matching lines @@
     // We're done configuring, so notify ProfileSyncService that it is OK to
     // start syncing.
     service->SetSyncSetupCompleted();
   }
 }
 
 bool SyncSetupHandler::IsActiveLogin() const {
   // LoginUIService can be NULL if page is brought up in incognito mode
   // (i.e. if the user is running in guest mode in cros and brings up settings).
   LoginUIService* service = GetLoginUIService();
-  return service && (service->current_login_ui() == web_ui());
+  return service && (service->current_login_ui() == this);
 }
 
 void SyncSetupHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback(
       "SyncSetupDidClosePage",
       base::Bind(&SyncSetupHandler::OnDidClosePage,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(
       "SyncSetupSubmitAuth",
       base::Bind(&SyncSetupHandler::HandleSubmitAuth,
@@ skipping 314 matching lines @@
   DCHECK(service);
 
 #if defined(OS_CHROMEOS)
   if (service->GetAuthError().state() != GoogleServiceAuthError::NONE) {
     DLOG(INFO) << "Signing out the user to fix a sync error.";
     BrowserList::GetLastActive()->ExecuteCommand(IDC_EXIT);
     return;
   }
 #endif
 
-  LoginUIServiceFactory::GetForProfile(GetProfile())->ShowLoginUI(false);
+  // Bring up the existing wizard, or just display it on this page.
+  if (!FocusExistingWizardIfPresent()) {

[James Hawkins, 2012/04/27 17:19:03]

Optional nit: I believe the precedence in this file is to not use braces for
single-line logic blocks.

[Andrew T Wilson (Slow), 2012/04/28 00:32:28]

Done.

+    OpenSyncSetup(false);
+  }
 }
 
 void SyncSetupHandler::HandleShowSetupUI(const ListValue* args) {
   DCHECK(!configuring_sync_);
   OpenSyncSetup(false);
 }
 
 void SyncSetupHandler::HandleStopSyncing(const ListValue* args) {
   ProfileSyncService* service = GetSyncService();
   DCHECK(service);
@@ skipping 15 matching lines @@
       } else if (configuring_sync_) {
         ProfileSyncService::SyncEvent(
             ProfileSyncService::CANCEL_DURING_CONFIGURE);
       } else {
         ProfileSyncService::SyncEvent(
             ProfileSyncService::CANCEL_FROM_SIGNON_WITHOUT_AUTH);
       }
     }
 
     // Let the various services know that we're no longer active.
-    GetLoginUIService()->LoginUIClosed(web_ui());
+    GetLoginUIService()->LoginUIClosed(this);
     if (sync_service)
       sync_service->set_setup_in_progress(false);
 
     // Make sure user isn't left half-logged-in (signed in, but without sync
     // started up). If the user hasn't finished setting up sync, then sign out
     // and shut down sync.
     if (sync_service && !sync_service->HasSyncSetupCompleted()) {
       DVLOG(1) << "Signin aborted by user action";
       sync_service->DisableForUser();
 #if !defined(OS_CHROMEOS)
@@ skipping 22 matching lines @@
   }
 
   // If the wizard is already visible, just focus that one.
   if (FocusExistingWizardIfPresent()) {
     if (!IsActiveLogin())
       CloseOverlay();
     return;
   }
 
   // Notify services that we are now active.
-  GetLoginUIService()->SetLoginUI(web_ui());
+  GetLoginUIService()->SetLoginUI(this);
   service->set_setup_in_progress(true);
 
   // There are several different UI flows that can bring the user here:
   // 1) Signin promo (passes force_login=true)
   // 2) Normal signin through options page (AreCredentialsAvailable() will
   //    return false).
   // 3) Previously working credentials have expired
   //    (service->GetAuthError() != NONE).
   // 4) User is already signed in, but App Notifications needs to force another
   //    login so it can fetch an oauth token (passes force_login=true)
@@ skipping 31 matching lines @@
         new SigninTracker(GetProfile(), this,
                           SigninTracker::SERVICES_INITIALIZING));
     service->set_setup_in_progress(true);
     service->UnsuppressAndStart();
     DisplaySpinner();
   } else {
     DisplayConfigureSync(true, false);
   }
 }
 
+void SyncSetupHandler::FocusUI() {
+  DCHECK(IsActiveLogin());
+  web_ui()->GetWebContents()->GetRenderViewHost()->GetDelegate()->Activate();
+}
+
+void SyncSetupHandler::CloseUI() {
+  DCHECK(IsActiveLogin());
+  CloseOverlay();
+}
+
 // Private member functions.
 
 bool SyncSetupHandler::FocusExistingWizardIfPresent() {
   LoginUIService* service = GetLoginUIService();
   if (!service->current_login_ui())
     return false;
-  service->FocusLoginUI();
+  service->current_login_ui()->FocusUI();
   return true;
 }
 
 LoginUIService* SyncSetupHandler::GetLoginUIService() const {
   return LoginUIServiceFactory::GetForProfile(GetProfile());
 }
 
 void SyncSetupHandler::CloseOverlay() {
   CloseSyncSetup();
   web_ui()->CallJavascriptFunction("OptionsPage.closeOverlay");
@@ skipping 18 matching lines @@
     if (i != current_profile_index && AreUserNamesEqual(
         cache.GetUserNameOfProfileAtIndex(i), username_utf16)) {
       *error_message = l10n_util::GetStringUTF16(
           IDS_SYNC_USER_NAME_IN_USE_ERROR);
       return false;
     }
   }
 
   return true;
 }