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

Side by Side Diff: chrome/browser/ui/webui/sync_setup_handler.cc

Issue 9225053: Add a blocking version of the sync promo dialog (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address review comments Created 8 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/ui/webui/sync_setup_handler.h" 5 #include "chrome/browser/ui/webui/sync_setup_handler.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/json/json_reader.h" 9 #include "base/json/json_reader.h"
10 #include "base/json/json_writer.h" 10 #include "base/json/json_writer.h"
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 "passphraseEncryptionMessage", 215 "passphraseEncryptionMessage",
216 GetStringFUTF16(IDS_SYNC_PASSPHRASE_ENCRYPTION_MESSAGE, product_name)); 216 GetStringFUTF16(IDS_SYNC_PASSPHRASE_ENCRYPTION_MESSAGE, product_name));
217 localized_strings->SetString( 217 localized_strings->SetString(
218 "passphraseRecover", 218 "passphraseRecover",
219 GetStringFUTF16(IDS_SYNC_PASSPHRASE_RECOVER, 219 GetStringFUTF16(IDS_SYNC_PASSPHRASE_RECOVER,
220 ASCIIToUTF16(google_util::StringAppendGoogleLocaleParam( 220 ASCIIToUTF16(google_util::StringAppendGoogleLocaleParam(
221 chrome::kSyncGoogleDashboardURL)))); 221 chrome::kSyncGoogleDashboardURL))));
222 222
223 bool is_launch_page = web_ui && SyncPromoUI::GetIsLaunchPageForSyncPromoURL( 223 bool is_launch_page = web_ui && SyncPromoUI::GetIsLaunchPageForSyncPromoURL(
224 web_ui->GetWebContents()->GetURL()); 224 web_ui->GetWebContents()->GetURL());
225 int title_id = is_launch_page ? IDS_SYNC_PROMO_TITLE : 225 int title_id = is_launch_page ? IDS_SYNC_PROMO_TITLE_SHORT :
Dan Beam 2012/01/30 18:10:05 where did this change? did this value already exis
sail 2012/01/30 21:52:36 yea, this value already existed, I was using the w
226 IDS_SYNC_PROMO_TITLE_EXISTING_USER; 226 IDS_SYNC_PROMO_TITLE_EXISTING_USER;
227 string16 short_product_name(GetStringUTF16(IDS_SHORT_PRODUCT_NAME)); 227 string16 short_product_name(GetStringUTF16(IDS_SHORT_PRODUCT_NAME));
228 localized_strings->SetString( 228 localized_strings->SetString(
229 "promoTitle", GetStringFUTF16(title_id, short_product_name)); 229 "promoTitle", GetStringFUTF16(title_id, short_product_name));
230 230
231 localized_strings->SetString( 231 localized_strings->SetString(
232 "promoMessageTitle", 232 "promoMessageTitle",
233 GetStringFUTF16(IDS_SYNC_PROMO_MESSAGE_TITLE, short_product_name)); 233 GetStringFUTF16(IDS_SYNC_PROMO_MESSAGE_TITLE, short_product_name));
234 localized_strings->SetString( 234 localized_strings->SetString(
235 "syncEverythingHelpURL", chrome::kSyncEverythingLearnMoreURL); 235 "syncEverythingHelpURL", chrome::kSyncEverythingLearnMoreURL);
(...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after
665 return true; 665 return true;
666 } 666 }
667 667
668 void SyncSetupHandler::ShowLoginErrorMessage(const string16& error_message) { 668 void SyncSetupHandler::ShowLoginErrorMessage(const string16& error_message) {
669 DCHECK(flow_); 669 DCHECK(flow_);
670 DictionaryValue args; 670 DictionaryValue args;
671 flow_->GetArgsForGaiaLogin(&args); 671 flow_->GetArgsForGaiaLogin(&args);
672 args.SetString("error_message", error_message); 672 args.SetString("error_message", error_message);
673 ShowGaiaLogin(args); 673 ShowGaiaLogin(args);
674 } 674 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698