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

Unified Diff: chrome/browser/ui/webui/options/sync_setup_handler.cc

Issue 2664753002: Remove base::StringValue (Closed)
Patch Set: Rebase Created 3 years, 9 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/ui/webui/options/sync_setup_handler.cc
diff --git a/chrome/browser/ui/webui/options/sync_setup_handler.cc b/chrome/browser/ui/webui/options/sync_setup_handler.cc
index 4e2457e0e401fa49bc93b4e2f716b4095b747475..6c4e9b632f0284eb192e8d54a3c59f880e4f25a6 100644
--- a/chrome/browser/ui/webui/options/sync_setup_handler.cc
+++ b/chrome/browser/ui/webui/options/sync_setup_handler.cc
@@ -285,7 +285,7 @@ void SyncSetupHandler::GetStaticLocalizedValues(
}
void SyncSetupHandler::ConfigureSyncDone() {
- base::StringValue page("done");
+ base::Value page("done");
web_ui()->CallJavascriptFunctionUnsafe("SyncSetupOverlay.showSyncSetupPage",
page);
@@ -427,7 +427,7 @@ bool SyncSetupHandler::PrepareSyncSetup() {
void SyncSetupHandler::DisplaySpinner() {
configuring_sync_ = true;
- base::StringValue page("spinner");
+ base::Value page("spinner");
base::DictionaryValue args;
const int kTimeoutSec = 30;
@@ -450,7 +450,7 @@ void SyncSetupHandler::DisplayTimeout() {
// Do not listen to sync startup events.
sync_startup_tracker_.reset();
- base::StringValue page("timeout");
+ base::Value page("timeout");
base::DictionaryValue args;
web_ui()->CallJavascriptFunctionUnsafe("SyncSetupOverlay.showSyncSetupPage",
page, args);
@@ -797,7 +797,7 @@ void SyncSetupHandler::FocusUI() {
void SyncSetupHandler::CloseUI() {
CloseSyncSetup();
- base::StringValue page("done");
+ base::Value page("done");
web_ui()->CallJavascriptFunctionUnsafe("SyncSetupOverlay.showSyncSetupPage",
page);
}
@@ -942,7 +942,7 @@ void SyncSetupHandler::DisplayConfigureSync(bool passphrase_failed) {
GetStringUTF16(IDS_SYNC_FULL_ENCRYPTION_DATA));
}
- base::StringValue page("configure");
+ base::Value page("configure");
web_ui()->CallJavascriptFunctionUnsafe("SyncSetupOverlay.showSyncSetupPage",
page, args);

Powered by Google App Engine
This is Rietveld 408576698