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

Unified Diff: chrome/browser/ui/webui/signin/signin_supervised_user_import_handler.cc

Issue 2040473002: Move {Resolve|Reject}JavascriptCallback helpers in WebUIMessageHandler. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resolvig conflicts with ToT Created 4 years, 6 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/signin/signin_supervised_user_import_handler.cc
diff --git a/chrome/browser/ui/webui/signin/signin_supervised_user_import_handler.cc b/chrome/browser/ui/webui/signin/signin_supervised_user_import_handler.cc
index e5d20c6bc42bef76a18b306bcc1ec52540a511b9..ae5da11cc0181feb61e542bfb14ec0efb58d33d4 100644
--- a/chrome/browser/ui/webui/signin/signin_supervised_user_import_handler.cc
+++ b/chrome/browser/ui/webui/signin/signin_supervised_user_import_handler.cc
@@ -81,6 +81,7 @@ void SigninSupervisedUserImportHandler::AssignWebUICallbackId(
CHECK_LE(1U, args->GetSize());
CHECK(webui_callback_id_.empty());
CHECK(args->GetString(0, &webui_callback_id_));
+ AllowJavascript();
}
void SigninSupervisedUserImportHandler::OpenUrlInLastActiveProfileBrowser(
@@ -190,9 +191,9 @@ void SigninSupervisedUserImportHandler::LoadCustodianProfileCallback(
void SigninSupervisedUserImportHandler::RejectCallback(
const base::string16& error) {
- web_ui()->CallJavascriptFunctionUnsafe(
- "cr.webUIResponse", base::StringValue(webui_callback_id_),
- base::FundamentalValue(false), base::StringValue(error));
+ RejectJavascriptCallback(
+ base::StringValue(webui_callback_id_),
+ base::StringValue(error));
webui_callback_id_.clear();
}
@@ -266,9 +267,9 @@ void SigninSupervisedUserImportHandler::SendExistingSupervisedUsers(
}
// Resolve callback with response.
- web_ui()->CallJavascriptFunctionUnsafe(
- "cr.webUIResponse", base::StringValue(webui_callback_id_),
- base::FundamentalValue(true), supervised_users);
+ ResolveJavascriptCallback(
+ base::StringValue(webui_callback_id_),
+ supervised_users);
webui_callback_id_.clear();
}

Powered by Google App Engine
This is Rietveld 408576698