Allow signin to continue even if sync is disabled by policy.

chrome/browser/signin/signin_global_error.cc

 // Copyright (c) 2013 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/signin/signin_global_error.h"
 
 #include "base/logging.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/signin/signin_manager.h"
-#include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/global_error/global_error_service.h"
 #include "chrome/browser/ui/global_error/global_error_service_factory.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 "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
-SigninGlobalError::SigninGlobalError(Profile* profile)
+SigninGlobalError::SigninGlobalError(SigninManager* manager, Profile* profile)
     : auth_error_(GoogleServiceAuthError::None()),
+      signin_manager_(manager),
       profile_(profile) {
 }
 
 SigninGlobalError::~SigninGlobalError() {
   DCHECK(provider_set_.empty())
       << "All AuthStatusProviders should be unregistered before"
       << " SigninManager::Shutdown() is called";
 }
 
 void SigninGlobalError::AddProvider(const AuthStatusProvider* provider) {
@@ skipping 55 matching lines @@
 #else
   return false;
 #endif
 }
 
 int SigninGlobalError::MenuItemCommandID() {
   return IDC_SHOW_SIGNIN_ERROR;
 }
 
 string16 SigninGlobalError::MenuItemLabel() {
-  if (SigninManagerFactory::GetForProfile(profile_)->
-          GetAuthenticatedUsername().empty() ||
+  if (signin_manager_->GetAuthenticatedUsername().empty() ||
       auth_error_.state() == GoogleServiceAuthError::NONE ||
       auth_error_.state() == GoogleServiceAuthError::CONNECTION_FAILED) {
     // If the user isn't signed in, or there's no auth error worth elevating to
     // the user, don't display any menu item.
     return string16();
   } else {
     // There's an auth error the user should know about - notify the user.
     return l10n_util::GetStringUTF16(IDS_SYNC_SIGN_IN_ERROR_WRENCH_MENU_ITEM);
   }
 }
@@ skipping 23 matching lines @@
 bool SigninGlobalError::HasBubbleView() {
   return !GetBubbleViewMessage().empty();
 }
 
 string16 SigninGlobalError::GetBubbleViewTitle() {
   return l10n_util::GetStringUTF16(IDS_SIGNIN_ERROR_BUBBLE_VIEW_TITLE);
 }
 
 string16 SigninGlobalError::GetBubbleViewMessage() {
   // If the user isn't signed in, no need to display an error bubble.
-  if (SigninManagerFactory::GetForProfile(profile_)->
-          GetAuthenticatedUsername().empty()) {
+  if (signin_manager_->GetAuthenticatedUsername().empty()) {
     return string16();
   }
 
   switch (auth_error_.state()) {
     // In the case of no error, or a simple network error, don't bother
     // displaying a popup bubble.
     case GoogleServiceAuthError::CONNECTION_FAILED:
     case GoogleServiceAuthError::NONE:
       return string16();
 
@@ skipping 37 matching lines @@
 void SigninGlobalError::OnBubbleViewDidClose(Browser* browser) {
 }
 
 void SigninGlobalError::BubbleViewAcceptButtonPressed(Browser* browser) {
   ExecuteMenuItem(browser);
 }
 
 void SigninGlobalError::BubbleViewCancelButtonPressed(Browser* browser) {
   NOTREACHED();
 }