Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4558)

Unified Diff: chrome/browser/ui/webui/options/clear_browser_data_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, 7 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
Index: chrome/browser/ui/webui/options/clear_browser_data_handler.cc
diff --git a/chrome/browser/ui/webui/options/clear_browser_data_handler.cc b/chrome/browser/ui/webui/options/clear_browser_data_handler.cc
index ae3433804f91ce1f9adb7faafc547ffce72f4f17..ef1d0bfa4835bce508b9446fd1b21b9d2e148e04 100644
--- a/chrome/browser/ui/webui/options/clear_browser_data_handler.cc
+++ b/chrome/browser/ui/webui/options/clear_browser_data_handler.cc
@@ -103,7 +103,7 @@ void ClearBrowserDataHandler::InitializeHandler() {
}
void ClearBrowserDataHandler::InitializePage() {
- web_ui()->CallJavascriptFunction(
+ web_ui()->CallJavascriptFunctionUnsafe(
"ClearBrowserDataOverlay.createFooter",
base::FundamentalValue(AreCountersEnabled()),
base::FundamentalValue(sync_service_ && sync_service_->IsSyncActive()),
@@ -112,10 +112,11 @@ void ClearBrowserDataHandler::InitializePage() {
UpdateInfoBannerVisibility();
OnBrowsingHistoryPrefChanged();
bool removal_in_progress = !!remover_;
- web_ui()->CallJavascriptFunction("ClearBrowserDataOverlay.setClearing",
- base::FundamentalValue(removal_in_progress));
+ web_ui()->CallJavascriptFunctionUnsafe(
+ "ClearBrowserDataOverlay.setClearing",
+ base::FundamentalValue(removal_in_progress));
- web_ui()->CallJavascriptFunction(
+ web_ui()->CallJavascriptFunctionUnsafe(
"ClearBrowserDataOverlay.markInitializationComplete");
}
@@ -138,8 +139,8 @@ void ClearBrowserDataHandler::UpdateInfoBannerVisibility() {
}
}
- web_ui()->CallJavascriptFunction("ClearBrowserDataOverlay.setBannerText",
- base::StringValue(text));
+ web_ui()->CallJavascriptFunctionUnsafe(
+ "ClearBrowserDataOverlay.setBannerText", base::StringValue(text));
}
void ClearBrowserDataHandler::OnPageOpened(const base::ListValue* value) {
@@ -353,13 +354,12 @@ void ClearBrowserDataHandler::OnBrowsingDataRemoverDone() {
UMA_HISTOGRAM_BOOLEAN(
"History.ClearBrowsingData.ShownHistoryNoticeAfterClearing", show_notice);
- web_ui()->CallJavascriptFunction(
- "ClearBrowserDataOverlay.doneClearing",
- base::FundamentalValue(show_notice));
+ web_ui()->CallJavascriptFunctionUnsafe("ClearBrowserDataOverlay.doneClearing",
+ base::FundamentalValue(show_notice));
}
void ClearBrowserDataHandler::OnBrowsingHistoryPrefChanged() {
- web_ui()->CallJavascriptFunction(
+ web_ui()->CallJavascriptFunctionUnsafe(
"ClearBrowserDataOverlay.setAllowDeletingHistory",
base::FundamentalValue(*allow_deleting_browser_history_));
}
@@ -378,14 +378,14 @@ void ClearBrowserDataHandler::AddCounter(
void ClearBrowserDataHandler::UpdateCounterText(
std::unique_ptr<BrowsingDataCounter::Result> result) {
DCHECK(AreCountersEnabled());
- web_ui()->CallJavascriptFunction(
+ web_ui()->CallJavascriptFunctionUnsafe(
"ClearBrowserDataOverlay.updateCounter",
base::StringValue(result->source()->GetPrefName()),
base::StringValue(GetCounterTextFromResult(result.get())));
}
void ClearBrowserDataHandler::OnStateChanged() {
- web_ui()->CallJavascriptFunction(
+ web_ui()->CallJavascriptFunctionUnsafe(
"ClearBrowserDataOverlay.updateSyncWarningAndHistoryFooter",
base::FundamentalValue(sync_service_ && sync_service_->IsSyncActive()),
base::FundamentalValue(should_show_history_notice_));

Powered by Google App Engine
This is Rietveld 408576698