Clean up straggler classes to use embedded signin in page in the new profiles world.

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"
 #include "chrome/browser/signin/signin_header_helper.h"
 #include "chrome/browser/signin/signin_manager_factory.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 "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "net/base/url_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if !defined(OS_ANDROID) && !defined(OS_IOS)
 #include "chrome/browser/signin/signin_promo.h"
+#include "chrome/browser/ui/sync/signin_histogram.h"
 #endif
 
 SigninGlobalError::SigninGlobalError(
     SigninErrorController* error_controller,
     Profile* profile)
     : profile_(profile),
       error_controller_(error_controller),
       is_added_to_global_error_service_(false) {
   error_controller_->AddObserver(this);
   is_added_to_global_error_service_ = !switches::IsNewAvatarMenu();
@@ skipping 54 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;
   }
 
+  UMA_HISTOGRAM_ENUMERATION("Signin.Reauth",
+                            signin::HISTOGRAM_SHOWN,
+                            signin::HISTOGRAM_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()));
   }
 #endif
@@ skipping 68 matching lines @@
   ExecuteMenuItem(browser);
 }
 
 void SigninGlobalError::BubbleViewCancelButtonPressed(Browser* browser) {
   NOTREACHED();
 }
 
 void SigninGlobalError::OnErrorChanged() {
   GlobalErrorServiceFactory::GetForProfile(profile_)->NotifyErrorsChanged(this);
 }