chrome/browser/ui/webui/options/search_engine_manager_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/options/search_engine_manager_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/options/reset_profile_settings_handler.cc ('k') | chrome/browser/ui/webui/options/startup_pages_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/search_engine_manager_handler.cc

diff --git a/chrome/browser/ui/webui/options/search_engine_manager_handler.cc b/chrome/browser/ui/webui/options/search_engine_manager_handler.cc

index 8cd310ae2a3d46f21d8d823905654f92d76d0457..e796310a443fb5a87751029db53998155fceab22 100644

--- a/chrome/browser/ui/webui/options/search_engine_manager_handler.cc

+++ b/chrome/browser/ui/webui/options/search_engine_manager_handler.cc

@@ -151,8 +151,9 @@ void SearchEngineManagerHandler::OnModelChanged() {

keyword_list.Append(CreateDictionaryForEngine(i, i == default_index));

}

- web_ui()->CallJavascriptFunction("SearchEngineManager.updateSearchEngineList",

- defaults_list, others_list, keyword_list);

+ web_ui()->CallJavascriptFunctionUnsafe(

+ "SearchEngineManager.updateSearchEngineList", defaults_list, others_list,

+ keyword_list);

}

void SearchEngineManagerHandler::OnItemsChanged(int start, int length) {

@@ -296,8 +297,8 @@ void SearchEngineManagerHandler::CheckSearchEngineInfoValidity(

validity.SetBoolean("keyword", edit_controller_->IsKeywordValid(keyword));

validity.SetBoolean("url", edit_controller_->IsURLValid(url));

base::StringValue indexValue(modelIndex);

- web_ui()->CallJavascriptFunction("SearchEngineManager.validityCheckCallback",

- validity, indexValue);

+ web_ui()->CallJavascriptFunctionUnsafe(

+ "SearchEngineManager.validityCheckCallback", validity, indexValue);

}

void SearchEngineManagerHandler::EditCancelled(const base::ListValue* args) {