Index: chrome/browser/sync/sync_global_error.cc |
diff --git a/chrome/browser/sync/sync_global_error.cc b/chrome/browser/sync/sync_global_error.cc |
index b4988eb0d23c31f4ddd49f6176725ebf291304a3..1e539c8bc674b676d9197b938cbc81bf1b3c274b 100644 |
--- a/chrome/browser/sync/sync_global_error.cc |
+++ b/chrome/browser/sync/sync_global_error.cc |
@@ -21,8 +21,6 @@ |
#include "grit/generated_resources.h" |
#include "ui/base/l10n/l10n_util.h" |
-typedef GoogleServiceAuthError AuthError; |
- |
SyncGlobalError::SyncGlobalError(ProfileSyncService* service, |
SigninManager* signin) |
: service_(service), |
@@ -51,7 +49,7 @@ bool SyncGlobalError::HasMenuItem() { |
} |
int SyncGlobalError::MenuItemCommandID() { |
- return IDC_SHOW_SYNC_ERROR; |
+ return IDC_SHOW_SIGNIN_ERROR; |
} |
string16 SyncGlobalError::MenuItemLabel() { |
@@ -59,14 +57,6 @@ string16 SyncGlobalError::MenuItemLabel() { |
} |
void SyncGlobalError::ExecuteMenuItem(Browser* browser) { |
-#if defined(OS_CHROMEOS) |
- if (service_->GetAuthError().state() != AuthError::NONE) { |
- DLOG(INFO) << "Signing out the user to fix a sync error."; |
- // TODO(beng): seems like this could just call browser::AttemptUserExit(). |
- chrome::ExecuteCommand(browser, IDC_EXIT); |
- return; |
- } |
-#endif |
LoginUIService* login_ui = LoginUIServiceFactory::GetForProfile( |
service_->profile()); |
if (login_ui->current_login_ui()) { |
@@ -135,7 +125,3 @@ void SyncGlobalError::OnStateChanged() { |
} |
} |
} |
- |
-bool SyncGlobalError::HasCustomizedSyncMenuItem() { |
- return !menu_label_.empty(); |
-} |