Chromium Code Reviews| 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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 86 #if defined(OS_CHROMEOS) | 86 #if defined(OS_CHROMEOS) |
| 87 if (error_controller_->auth_error().state() != | 87 if (error_controller_->auth_error().state() != |
| 88 GoogleServiceAuthError::NONE) { | 88 GoogleServiceAuthError::NONE) { |
| 89 DVLOG(1) << "Signing out the user to fix a sync error."; | 89 DVLOG(1) << "Signing out the user to fix a sync error."; |
| 90 // TODO(beng): seems like this could just call chrome::AttemptUserExit(). | 90 // TODO(beng): seems like this could just call chrome::AttemptUserExit(). |
| 91 chrome::ExecuteCommand(browser, IDC_EXIT); | 91 chrome::ExecuteCommand(browser, IDC_EXIT); |
| 92 return; | 92 return; |
| 93 } | 93 } |
| 94 #endif | 94 #endif |
| 95 | 95 |
| 96 // Global errors don't show up in the wrench menu on android. | 96 // Global errors don't show up in the wrench menu on android. |
|
Nico
2014/12/09 16:29:56
s/android/mobile/
stuartmorgan
2014/12/09 16:31:26
Done.
| |
| 97 #if !defined(OS_ANDROID) | 97 #if !defined(OS_ANDROID) && !defined(OS_IOS) |
| 98 LoginUIService* login_ui = LoginUIServiceFactory::GetForProfile(profile_); | 98 LoginUIService* login_ui = LoginUIServiceFactory::GetForProfile(profile_); |
| 99 if (login_ui->current_login_ui()) { | 99 if (login_ui->current_login_ui()) { |
| 100 login_ui->current_login_ui()->FocusUI(); | 100 login_ui->current_login_ui()->FocusUI(); |
| 101 return; | 101 return; |
| 102 } | 102 } |
| 103 | 103 |
| 104 if (switches::IsNewAvatarMenu()) { | 104 if (switches::IsNewAvatarMenu()) { |
| 105 browser->window()->ShowAvatarBubbleFromAvatarButton( | 105 browser->window()->ShowAvatarBubbleFromAvatarButton( |
| 106 BrowserWindow::AVATAR_BUBBLE_MODE_REAUTH, | 106 BrowserWindow::AVATAR_BUBBLE_MODE_REAUTH, |
| 107 signin::ManageAccountsParams()); | 107 signin::ManageAccountsParams()); |
| (...skipping 74 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 |