Removed ProfileSyncService::UIShouldDepictAuthInProgress

chrome/browser/ui/webui/options2/browser_options_handler2.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/options2/browser_options_handler2.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 23 matching lines @@
 #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_url.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_info_util.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/service/service_process_control.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/sync/sync_ui_util.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/options/options_util.h"
 #include "chrome/browser/ui/webui/favicon_source.h"
 #include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
@@ skipping 955 matching lines @@
   sync_status->SetBoolean("syncSystemEnabled", !!service);
   if (!service)
     return sync_status;
 
   sync_status->SetBoolean("setupCompleted",
                           service->HasSyncSetupCompleted());
   sync_status->SetBoolean("setupInProgress", service->FirstSetupInProgress());
 
   string16 status_label;
   string16 link_label;
+  SigninManager* signin = SigninManagerFactory::GetForProfile(
+      Profile::FromWebUI(web_ui()));
+
   bool status_has_error = sync_ui_util::GetStatusLabels(
-      service, sync_ui_util::WITH_HTML, &status_label, &link_label) ==
+      service, *signin, sync_ui_util::WITH_HTML, &status_label, &link_label) ==
           sync_ui_util::SYNC_ERROR;
   sync_status->SetString("statusText", status_label);
   sync_status->SetString("actionLinkText", link_label);
   sync_status->SetBoolean("hasError", status_has_error);
 
   sync_status->SetBoolean("managed", service->IsManaged());
   sync_status->SetBoolean("hasUnrecoverableError",
                           service->unrecoverable_error_detected());
   sync_status->SetBoolean("autoLoginVisible",
       CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableAutologin) &&
@@ skipping 383 matching lines @@
 }
 
 void BrowserOptionsHandler::SetupSSLConfigSettings() {
   base::FundamentalValue checked(rev_checking_enabled_.GetValue());
   base::FundamentalValue disabled(rev_checking_enabled_.IsManaged());
   web_ui()->CallJavascriptFunction(
       "BrowserOptions.setCheckRevocationCheckboxState", checked, disabled);
 }
 
 }  // namespace options2