Refactor LoginUIService to not rely on WebUI.

chrome/browser/extensions/app_notify_channel_ui.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/extensions/app_notify_channel_ui.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/signin/signin_manager.h"
+#include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
+#include "chrome/common/url_constants.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 class AppNotifyChannelUIImpl::InfoBar : public ConfirmInfoBarDelegate {
@@ skipping 95 matching lines @@
   }
 
   InfoBarTabHelper* helper = wrapper_->infobar_tab_helper();
   helper->AddInfoBar(new AppNotifyChannelUIImpl::InfoBar(
       this, helper, app_name_));
 }
 
 void AppNotifyChannelUIImpl::OnInfoBarResult(bool accepted) {
   if (accepted) {
     StartObservingSync();
-    LoginUIServiceFactory::GetForProfile(profile_)->ShowLoginUI(true);
-  } else {
-    delegate_->OnSyncSetupResult(false);
+    // Let's bring up the login page.

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

nit: Don't use pronouns in comments, since pronouns are ambiguous.  The pronoun
here is 'us'.

Here and elsewhere.

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

Done.

+    LoginUIService* login_ui_service =
+        LoginUIServiceFactory::GetForProfile(profile_);
+    LoginUIService::LoginUI* login_ui = login_ui_service->current_login_ui();
+    if (login_ui) {
+      // Some sort of login UI is already visible.
+      SigninManager* signin = SigninManagerFactory::GetForProfile(profile_);
+      if (signin->GetAuthenticatedUsername().empty()) {
+        // We're not logged in yet, so just bring up the login UI (could be the
+        // promo UI).
+        login_ui->FocusUI();
+        return;
+      } else {
+        // We're already logged in, so close whatever sync config UI the
+        // user is looking at and display new login UI.
+        login_ui->CloseUI();
+        DCHECK(!login_ui_service->current_login_ui());
+      }
+    }
+    // Any existing UI is now closed - display new login UI.
+    Browser* browser = BrowserList::GetLastActiveWithProfile(profile_);
+    if (browser) {
+      browser->ShowOptionsTab(chrome::kSyncSetupForceLoginSubPage);
+      return;
+    }
+    // Should not be possible to have no browser here, since we're in an
+    // infobar callback.
+    NOTREACHED();
   }
+  delegate_->OnSyncSetupResult(false);
 }
 
 void AppNotifyChannelUIImpl::OnStateChanged() {
 #if !defined(OS_ANDROID)
   ProfileSyncService* sync_service =
       ProfileSyncServiceFactory::GetInstance()->GetForProfile(profile_);
   LoginUIService* login_service =
       LoginUIServiceFactory::GetForProfile(profile_);
 
   bool wizard_visible = (login_service->current_login_ui() != NULL);
@@ skipping 18 matching lines @@
   ProfileSyncServiceFactory::GetInstance()->GetForProfile(
       profile_)->AddObserver(this);
 }
 
 void AppNotifyChannelUIImpl::StopObservingSync() {
   CHECK(observing_sync_);
   observing_sync_ = false;
   ProfileSyncServiceFactory::GetInstance()->GetForProfile(
       profile_)->RemoveObserver(this);
 }