OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/signin/signin_global_error.h" | 5 #include "chrome/browser/signin/signin_global_error.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "chrome/app/chrome_command_ids.h" | 8 #include "chrome/app/chrome_command_ids.h" |
9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
10 #include "chrome/browser/signin/signin_header_helper.h" | 10 #include "chrome/browser/signin/signin_header_helper.h" |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
94 #if !defined(OS_ANDROID) | 94 #if !defined(OS_ANDROID) |
95 LoginUIService* login_ui = LoginUIServiceFactory::GetForProfile(profile_); | 95 LoginUIService* login_ui = LoginUIServiceFactory::GetForProfile(profile_); |
96 if (login_ui->current_login_ui()) { | 96 if (login_ui->current_login_ui()) { |
97 login_ui->current_login_ui()->FocusUI(); | 97 login_ui->current_login_ui()->FocusUI(); |
98 return; | 98 return; |
99 } | 99 } |
100 | 100 |
101 if (switches::IsNewAvatarMenu()) { | 101 if (switches::IsNewAvatarMenu()) { |
102 browser->window()->ShowAvatarBubbleFromAvatarButton( | 102 browser->window()->ShowAvatarBubbleFromAvatarButton( |
103 BrowserWindow::AVATAR_BUBBLE_MODE_REAUTH, | 103 BrowserWindow::AVATAR_BUBBLE_MODE_REAUTH, |
104 signin::GAIA_SERVICE_TYPE_NONE); | 104 signin::ManageAccountsParams()); |
105 } else { | 105 } else { |
106 chrome::ShowSingletonTab( | 106 chrome::ShowSingletonTab( |
107 browser, | 107 browser, |
108 signin::GetReauthURL(profile_, error_controller_->error_account_id())); | 108 signin::GetReauthURL(profile_, error_controller_->error_account_id())); |
109 } | 109 } |
110 #endif | 110 #endif |
111 } | 111 } |
112 | 112 |
113 bool SigninGlobalError::HasBubbleView() { | 113 bool SigninGlobalError::HasBubbleView() { |
114 return !GetBubbleViewMessages().empty(); | 114 return !GetBubbleViewMessages().empty(); |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
182 ExecuteMenuItem(browser); | 182 ExecuteMenuItem(browser); |
183 } | 183 } |
184 | 184 |
185 void SigninGlobalError::BubbleViewCancelButtonPressed(Browser* browser) { | 185 void SigninGlobalError::BubbleViewCancelButtonPressed(Browser* browser) { |
186 NOTREACHED(); | 186 NOTREACHED(); |
187 } | 187 } |
188 | 188 |
189 void SigninGlobalError::OnErrorChanged() { | 189 void SigninGlobalError::OnErrorChanged() { |
190 GlobalErrorServiceFactory::GetForProfile(profile_)->NotifyErrorsChanged(this); | 190 GlobalErrorServiceFactory::GetForProfile(profile_)->NotifyErrorsChanged(this); |
191 } | 191 } |
OLD | NEW |