Fix sign-in error strings.

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/profiles/profile.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/signin/signin_promo.h"
 #include "chrome/browser/ui/browser_commands.h"
+#include "chrome/browser/ui/browser_window.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/singleton_tabs.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 "components/signin/core/browser/signin_manager.h"
+#include "components/signin/core/common/profile_management_switches.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "net/base/url_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
 SigninGlobalError::SigninGlobalError(
     SigninErrorController* error_controller,
     Profile* profile)
     : profile_(profile),
-      error_controller_(error_controller) {
+      error_controller_(error_controller),
+      is_added_to_global_error_service_(false) {
   error_controller_->AddObserver(this);
-  GlobalErrorServiceFactory::GetForProfile(profile_)->AddGlobalError(this);
+  is_added_to_global_error_service_ = !switches::IsNewProfileManagement();
+  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() {
-  GlobalErrorServiceFactory::GetForProfile(profile_)->RemoveGlobalError(this);
+  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 18 matching lines @@
 #endif
 
   // Global errors don't show up in the wrench menu on android.
 #if !defined(OS_ANDROID)
   LoginUIService* login_ui = LoginUIServiceFactory::GetForProfile(profile_);
   if (login_ui->current_login_ui()) {
     login_ui->current_login_ui()->FocusUI();
     return;
   }
 
-  chrome::ShowSingletonTab(
-      browser,
-      signin::GetReauthURL(profile_, error_controller_->error_account_id()));
+  if (switches::IsNewProfileManagement()) {
+    browser->window()->ShowAvatarBubbleFromAvatarButton(
+        BrowserWindow::AVATAR_BUBBLE_MODE_REAUTH);
+  } else {
+    chrome::ShowSingletonTab(
+        browser,
+        signin::GetReauthURL(profile_, error_controller_->error_account_id()));
+  }
 #endif
 }
 
 bool SigninGlobalError::HasBubbleView() {
   return !GetBubbleViewMessages().empty();
 }
 
 base::string16 SigninGlobalError::GetBubbleViewTitle() {
   return l10n_util::GetStringUTF16(IDS_SIGNIN_ERROR_BUBBLE_VIEW_TITLE);
 }
@@ skipping 62 matching lines @@
   ExecuteMenuItem(browser);
 }
 
 void SigninGlobalError::BubbleViewCancelButtonPressed(Browser* browser) {
   NOTREACHED();
 }
 
 void SigninGlobalError::OnErrorChanged() {
   GlobalErrorServiceFactory::GetForProfile(profile_)->NotifyErrorsChanged(this);
 }