| 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 c7eb3a4b86be19be15d3b03f3d046d840202b12c..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,8 @@ void SigninSupervisedUserImportHandler::LoadCustodianProfileCallback(
|
|
|
| void SigninSupervisedUserImportHandler::RejectCallback(
|
| const base::string16& error) {
|
| - web_ui()->CallJavascriptFunction("cr.webUIResponse",
|
| + RejectJavascriptCallback(
|
| base::StringValue(webui_callback_id_),
|
| - base::FundamentalValue(false),
|
| base::StringValue(error));
|
| webui_callback_id_.clear();
|
| }
|
| @@ -267,9 +267,8 @@ void SigninSupervisedUserImportHandler::SendExistingSupervisedUsers(
|
| }
|
|
|
| // Resolve callback with response.
|
| - web_ui()->CallJavascriptFunction("cr.webUIResponse",
|
| + ResolveJavascriptCallback(
|
| base::StringValue(webui_callback_id_),
|
| - base::FundamentalValue(true),
|
| supervised_users);
|
| webui_callback_id_.clear();
|
| }
|
|
|