summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync
diff options
context:
space:
mode:
authorkmadhusu@chromium.org <kmadhusu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-03 21:05:01 +0000
committerkmadhusu@chromium.org <kmadhusu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-03 21:05:01 +0000
commit036056a357cf18b30070a1900164d1bf3967c39e (patch)
treedb6b3db45195d2c7660642d159a08db11ed1e17a /chrome/browser/sync
parentc41486d8085c6b748a26734701f0a02bafd18716 (diff)
downloadchromium_src-036056a357cf18b30070a1900164d1bf3967c39e.zip
chromium_src-036056a357cf18b30070a1900164d1bf3967c39e.tar.gz
chromium_src-036056a357cf18b30070a1900164d1bf3967c39e.tar.bz2
Remove web_ui_util helper functions.
Remove web_ui_util::GetJsonResponseFromFirstArgumentInList() & web_ui_util::GetJsonResponseFromArgumentList(). Associated review at: http://codereview.chromium.org/6574007/ BUG=none TEST=none Review URL: http://codereview.chromium.org/6581041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76806 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync')
-rw-r--r--chrome/browser/sync/sync_setup_flow.cc31
1 files changed, 22 insertions, 9 deletions
diff --git a/chrome/browser/sync/sync_setup_flow.cc b/chrome/browser/sync/sync_setup_flow.cc
index 1ffe223..cf7cc6e 100644
--- a/chrome/browser/sync/sync_setup_flow.cc
+++ b/chrome/browser/sync/sync_setup_flow.cc
@@ -181,11 +181,15 @@ static void DisablePasswordSync(ProfileSyncService* service) {
}
void FlowHandler::HandleSubmitAuth(const ListValue* args) {
- std::string json(web_ui_util::GetJsonResponseFromFirstArgumentInList(args));
- std::string username, password, captcha, access_code;
+ std::string json;
+ if (!args->GetString(0, &json)) {
+ NOTREACHED() << "Could not read JSON argument";
+ return;
+ }
if (json.empty())
return;
+ std::string username, password, captcha, access_code;
if (!GetAuthData(json, &username, &password, &captcha, &access_code)) {
// The page sent us something that we didn't understand.
// This probably indicates a programming error.
@@ -198,12 +202,15 @@ void FlowHandler::HandleSubmitAuth(const ListValue* args) {
}
void FlowHandler::HandleConfigure(const ListValue* args) {
- std::string json(web_ui_util::GetJsonResponseFromFirstArgumentInList(args));
- SyncConfiguration configuration;
-
+ std::string json;
+ if (!args->GetString(0, &json)) {
+ NOTREACHED() << "Could not read JSON argument";
+ return;
+ }
if (json.empty())
return;
+ SyncConfiguration configuration;
if (!GetConfiguration(json, &configuration)) {
// The page sent us something that we didn't understand.
// This probably indicates a programming error.
@@ -218,8 +225,11 @@ void FlowHandler::HandleConfigure(const ListValue* args) {
}
void FlowHandler::HandlePassphraseEntry(const ListValue* args) {
- std::string json(web_ui_util::GetJsonResponseFromFirstArgumentInList(args));
-
+ std::string json;
+ if (!args->GetString(0, &json)) {
+ NOTREACHED() << "Could not read JSON argument";
+ return;
+ }
if (json.empty())
return;
@@ -240,8 +250,11 @@ void FlowHandler::HandlePassphraseCancel(const ListValue* args) {
}
void FlowHandler::HandleFirstPassphrase(const ListValue* args) {
- std::string json(web_ui_util::GetJsonResponseFromFirstArgumentInList(args));
-
+ std::string json;
+ if (!args->GetString(0, &json)) {
+ NOTREACHED() << "Could not read JSON argument";
+ return;
+ }
if (json.empty())
return;