Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5780)

Unified Diff: chrome/browser/signin/signin_global_error.cc

Issue 1307093004: Remove references to IsNewAvatarMenu since the flag was removed. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address review feedback Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/signin/signin_global_error.h ('k') | chrome/browser/signin/signin_promo.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/signin/signin_global_error.cc
diff --git a/chrome/browser/signin/signin_global_error.cc b/chrome/browser/signin/signin_global_error.cc
index b2e8f86e68896c49b485ea25bf93ad00584a3e9e..71f8a46ac91fe04eaa833dc752a4747930ce4d66 100644
--- a/chrome/browser/signin/signin_global_error.cc
+++ b/chrome/browser/signin/signin_global_error.cc
@@ -35,12 +35,8 @@ 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() {
@@ -60,11 +56,6 @@ void SigninGlobalError::AttemptToFixError(Browser* 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;
}
@@ -106,15 +97,9 @@ void SigninGlobalError::ExecuteMenuItem(Browser* browser) {
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
}
« no previous file with comments | « chrome/browser/signin/signin_global_error.h ('k') | chrome/browser/signin/signin_promo.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698