chrome/browser/ui/webui/chromeos/login/network_dropdown.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/network_dropdown.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/kiosk_app_menu_handler.cc ('k') | chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index e18a15b8a300b8c548acf28aeabaf62e3f4fe922..96091bc2bfab4ecb40f36267f6191533570e90b2 100644

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

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

@@ -65,7 +65,8 @@ void NetworkMenuWebUI::UpdateMenu() {

NetworkMenu::UpdateMenu();

if (web_ui_) {

std::unique_ptr<base::ListValue> list(ConvertMenuModel(GetMenuModel()));

- web_ui_->CallJavascriptFunction("cr.ui.DropDown.updateNetworks", *list);

+ web_ui_->CallJavascriptFunctionUnsafe("cr.ui.DropDown.updateNetworks",

+ *list);

}

@@ -201,8 +202,8 @@ void NetworkDropdown::SetNetworkIconAndText() {

icon_str = webui::GetBitmapDataUrl(icon_bitmap);

base::StringValue title(text);

base::StringValue icon(icon_str);

- web_ui_->CallJavascriptFunction("cr.ui.DropDown.updateNetworkTitle",

- title, icon);

+ web_ui_->CallJavascriptFunctionUnsafe("cr.ui.DropDown.updateNetworkTitle",

+ title, icon);

}

void NetworkDropdown::RequestNetworkScan() {