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

Unified Diff: chrome/browser/dom_ui/options/personal_options_handler.cc

Issue 6489007: Always use ProfileSyncService::ShowErrorUI to handle error links. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 10 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
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) {
« no previous file with comments | « chrome/browser/dom_ui/options/personal_options_handler.h ('k') | chrome/browser/resources/options/personal_options.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698