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

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

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

index baa498b1c4408a11e2282083b0c85d98663f4fce..d26b0893a509b71f7b8bb72772d6912a4d106d31 100644

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

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

@@ -48,7 +48,7 @@ void ResetProfileSettingsHandler::InitializeHandler() {

}

void ResetProfileSettingsHandler::InitializePage() {

- web_ui()->CallJavascriptFunction(

+ web_ui()->CallJavascriptFunctionUnsafe(

"ResetProfileSettingsOverlay.setResettingState",

base::FundamentalValue(resetter_->IsActive()));

}

@@ -144,7 +144,8 @@ void ResetProfileSettingsHandler::HandleResetProfileSettings(

void ResetProfileSettingsHandler::OnResetProfileSettingsDone(

bool send_feedback) {

- web_ui()->CallJavascriptFunction("ResetProfileSettingsOverlay.doneResetting");

+ web_ui()->CallJavascriptFunctionUnsafe(

+ "ResetProfileSettingsOverlay.doneResetting");

if (send_feedback && setting_snapshot_) {

Profile* profile = Profile::FromWebUI(web_ui());

ResettableSettingsSnapshot current_snapshot(profile);

@@ -223,9 +224,8 @@ void ResetProfileSettingsHandler::UpdateFeedbackUI() {

Profile::FromWebUI(web_ui()), *setting_snapshot_);

base::DictionaryValue feedback_info;

feedback_info.Set("feedbackInfo", list.release());

- web_ui()->CallJavascriptFunction(

- "ResetProfileSettingsOverlay.setFeedbackInfo",

- feedback_info);

+ web_ui()->CallJavascriptFunctionUnsafe(

+ "ResetProfileSettingsOverlay.setFeedbackInfo", feedback_info);

}

} // namespace options