Reland c91b178b07b0d - Delete dead signin code (SigninGlobalError)

chrome/browser/ui/views/toolbar/toolbar_view.cc

 // Copyright 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/ui/views/toolbar/toolbar_view.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/i18n/number_formatting.h"
@@ skipping 61 matching lines @@
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/non_client_view.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/recovery/recovery_install_global_error_factory.h"
 #include "chrome/browser/ui/views/conflicting_module_view_win.h"
 #include "chrome/browser/ui/views/critical_notification_bubble_view.h"
 #endif
 
 #if !defined(OS_CHROMEOS)
-#include "chrome/browser/signin/signin_global_error_factory.h"
 #include "chrome/browser/sync/sync_global_error_factory.h"
 #endif
 
 #if defined(USE_ASH)
 #include "ash/shell.h"
 #endif
 
 using base::UserMetricsAction;
 using content::WebContents;
 
@@ skipping 120 matching lines @@
   AddChildView(forward_);
   AddChildView(reload_);
   AddChildView(home_);
   AddChildView(location_bar_);
   AddChildView(browser_actions_);
   AddChildView(app_menu_);
 
   LoadImages();
 
   // Start global error services now so we badge the menu correctly.
-#if !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
   if (!HasAshShell()) {
-    SigninGlobalErrorFactory::GetForProfile(browser_->profile());
-#if !defined(OS_ANDROID)
     SyncGlobalErrorFactory::GetForProfile(browser_->profile());
+  }
 #endif
-  }
 
 #if defined(OS_WIN)
   RecoveryInstallGlobalErrorFactory::GetForProfile(browser_->profile());
 #endif
-#endif  // OS_CHROMEOS
 
   // Add any necessary badges to the menu item based on the system state.
   // Do this after |app_menu_| has been added as a bubble may be shown that
   // needs the widget (widget found by way of app_menu_->GetWidget()).
   badge_controller_.UpdateDelegate();
 
   location_bar_->Init();
 
   show_home_button_.Init(prefs::kShowHomeButton,
                          browser_->profile()->GetPrefs(),
@@ skipping 595 matching lines @@
   SchedulePaint();
 }
 
 int ToolbarView::content_shadow_height() const {
   ui::ThemeProvider* theme_provider = GetThemeProvider();
   return theme_provider->GetDisplayProperty(
       browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH
           ? ThemeProperties::PROPERTY_TOOLBAR_VIEW_CONTENT_SHADOW_HEIGHT_ASH
           : ThemeProperties::PROPERTY_TOOLBAR_VIEW_CONTENT_SHADOW_HEIGHT);
 }