chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc - Issue 1995113002: Rename WebUI::CallJavascriptFunction to WebUI::CallJavascriptFunctionUnsafe

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc

Issue 1995113002: Rename WebUI::CallJavascriptFunction to WebUI::CallJavascriptFunctionUnsafe (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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

« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/inline_login_handler_chromeos.cc ('k') | chrome/browser/ui/webui/chromeos/login/network_dropdown.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc

diff --git a/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc b/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc

index 99604e4670f67f0a872a944481fd0e88e9423b93..fda7a0d9972b7fe318933c612f453c2c8f19e0b2 100644

--- a/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc

+++ b/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc

@@ -120,8 +120,8 @@ void KioskAppMenuHandler::SendKioskApps() {

apps_list.Append(app_info.release());

}

- web_ui()->CallJavascriptFunction(EnableNewKioskUI() ?

- kKioskSetAppsNewAPI : kKioskSetAppsOldAPI,

+ web_ui()->CallJavascriptFunctionUnsafe(

+ EnableNewKioskUI() ? kKioskSetAppsNewAPI : kKioskSetAppsOldAPI,

apps_list);

}

@@ -149,8 +149,8 @@ void KioskAppMenuHandler::HandleCheckKioskAppLaunchError(

const std::string error_message = KioskAppLaunchError::GetErrorMessage(error);

bool new_kiosk_ui = EnableNewKioskUI();

- web_ui()->CallJavascriptFunction(new_kiosk_ui ?

- kKioskShowErrorNewAPI : kKioskShowErrorOldAPI,

+ web_ui()->CallJavascriptFunctionUnsafe(

+ new_kiosk_ui ? kKioskShowErrorNewAPI : kKioskShowErrorOldAPI,

base::StringValue(error_message));

}