Index: chrome/browser/dom_ui/options/personal_options_handler.cc |
diff --git a/chrome/browser/dom_ui/options/personal_options_handler.cc b/chrome/browser/dom_ui/options/personal_options_handler.cc |
index 504ea54b4ca92bfe358c70861410ea89fcfd82b5..682ecff01c6a81192a3455f2a9a36ca2fb27d593 100644 |
--- a/chrome/browser/dom_ui/options/personal_options_handler.cc |
+++ b/chrome/browser/dom_ui/options/personal_options_handler.cc |
@@ -165,6 +165,9 @@ void PersonalOptionsHandler::GetLocalizedValues( |
void PersonalOptionsHandler::RegisterMessages() { |
DCHECK(dom_ui_); |
dom_ui_->RegisterMessageCallback( |
+ "showSyncActionDialog", |
+ NewCallback(this, &PersonalOptionsHandler::ShowSyncActionDialog)); |
+ dom_ui_->RegisterMessageCallback( |
"showSyncLoginDialog", |
NewCallback(this, &PersonalOptionsHandler::ShowSyncLoginDialog)); |
dom_ui_->RegisterMessageCallback( |
@@ -321,24 +324,26 @@ void PersonalOptionsHandler::Initialize() { |
} |
} |
-void PersonalOptionsHandler::ShowSyncLoginDialog(const ListValue* args) { |
+void PersonalOptionsHandler::ShowSyncActionDialog(const ListValue* args) { |
ProfileSyncService* service = dom_ui_->GetProfile()->GetProfileSyncService(); |
DCHECK(service); |
- if (service->HasSyncSetupCompleted()) { |
- service->ShowErrorUI(NULL); |
- } else { |
+ service->ShowErrorUI(NULL); |
+} |
+ |
+void PersonalOptionsHandler::ShowSyncLoginDialog(const ListValue* args) { |
#if defined(OS_CHROMEOS) |
- std::string email = chromeos::UserManager::Get()->logged_in_user().email(); |
- string16 message = l10n_util::GetStringFUTF16( |
- IDS_SYNC_LOGIN_INTRODUCTION, |
- l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); |
- dom_ui_->GetProfile()->GetBrowserSignin()->RequestSignin( |
- dom_ui_->tab_contents(), UTF8ToUTF16(email), message, this); |
+ std::string email = chromeos::UserManager::Get()->logged_in_user().email(); |
+ string16 message = l10n_util::GetStringFUTF16( |
+ IDS_SYNC_LOGIN_INTRODUCTION, |
+ l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); |
+ dom_ui_->GetProfile()->GetBrowserSignin()->RequestSignin( |
+ dom_ui_->tab_contents(), UTF8ToUTF16(email), message, this); |
#else |
- service->ShowLoginDialog(NULL); |
- ProfileSyncService::SyncEvent(ProfileSyncService::START_FROM_OPTIONS); |
+ ProfileSyncService* service = dom_ui_->GetProfile()->GetProfileSyncService(); |
+ DCHECK(service); |
+ service->ShowLoginDialog(NULL); |
+ ProfileSyncService::SyncEvent(ProfileSyncService::START_FROM_OPTIONS); |
#endif |
- } |
} |
void PersonalOptionsHandler::ShowCustomizeSyncDialog(const ListValue* args) { |