Remove references to IsNewAvatarMenu since the flag was removed.

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 "base/metrics/histogram_macros.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 17 matching lines @@
 #include "ui/base/l10n/l10n_util.h"
 
 #if !defined(OS_ANDROID) && !defined(OS_IOS)
 #include "chrome/browser/signin/signin_promo.h"
 #endif
 
 SigninGlobalError::SigninGlobalError(
     SigninErrorController* error_controller,
     Profile* profile)
     : profile_(profile),
-      error_controller_(error_controller),
-      is_added_to_global_error_service_(false) {
+      error_controller_(error_controller) {
   error_controller_->AddObserver(this);
-  is_added_to_global_error_service_ = !switches::IsNewAvatarMenu();
-  if (is_added_to_global_error_service_)
-    GlobalErrorServiceFactory::GetForProfile(profile_)->AddGlobalError(this);
 }
 
 SigninGlobalError::~SigninGlobalError() {
   DCHECK(!error_controller_)
       << "SigninGlobalError::Shutdown() was not called";
 }
 
 bool SigninGlobalError::HasError() {
   return HasMenuItem();
 }
 
 void SigninGlobalError::AttemptToFixError(Browser* browser) {
   if (!HasError())
     return;
 
   ExecuteMenuItem(browser);
 }
 
 void SigninGlobalError::Shutdown() {
-  if (is_added_to_global_error_service_) {
-    GlobalErrorServiceFactory::GetForProfile(profile_)->RemoveGlobalError(this);
-    is_added_to_global_error_service_ = false;
-  }
-
   error_controller_->RemoveObserver(this);
   error_controller_ = NULL;
 }
 
 bool SigninGlobalError::HasMenuItem() {
   return error_controller_->HasError();
 }
 
 int SigninGlobalError::MenuItemCommandID() {
   return IDC_SHOW_SIGNIN_ERROR;
@@ skipping 21 matching lines @@
 #if !defined(OS_ANDROID) && !defined(OS_IOS)
   LoginUIService* login_ui = LoginUIServiceFactory::GetForProfile(profile_);
   if (login_ui->current_login_ui()) {
     login_ui->current_login_ui()->FocusUI();
     return;
   }
 
   UMA_HISTOGRAM_ENUMERATION("Signin.Reauth",
                             signin_metrics::HISTOGRAM_REAUTH_SHOWN,
                             signin_metrics::HISTOGRAM_REAUTH_MAX);
-  if (switches::IsNewAvatarMenu()) {
-    browser->window()->ShowAvatarBubbleFromAvatarButton(
-        BrowserWindow::AVATAR_BUBBLE_MODE_REAUTH,
-        signin::ManageAccountsParams());
-  } else {
-    chrome::ShowSingletonTab(
-        browser,
-        signin::GetReauthURL(profile_, error_controller_->error_account_id()));
-  }
+  browser->window()->ShowAvatarBubbleFromAvatarButton(
+      BrowserWindow::AVATAR_BUBBLE_MODE_REAUTH,
+      signin::ManageAccountsParams());
 #endif
 }
 
 bool SigninGlobalError::HasBubbleView() {
   return !GetBubbleViewMessages().empty();
 }
 
 base::string16 SigninGlobalError::GetBubbleViewTitle() {
   return l10n_util::GetStringUTF16(IDS_SIGNIN_ERROR_BUBBLE_VIEW_TITLE);
 }
@@ skipping 59 matching lines @@
   ExecuteMenuItem(browser);
 }
 
 void SigninGlobalError::BubbleViewCancelButtonPressed(Browser* browser) {
   NOTREACHED();
 }
 
 void SigninGlobalError::OnErrorChanged() {
   GlobalErrorServiceFactory::GetForProfile(profile_)->NotifyErrorsChanged(this);
 }