Commit 44a616a0 authored by Daniel Bratell's avatar Daniel Bratell Committed by Commit Bot

Giving a couple of HandleRequestCallback functions unique names

The different HandleRequestCallback functions clashed in jumbo
builds so this patch renames them.

Jumbo builds are builds where cc files are merged for dramatically
higher build performance.

Bug: 746953
Change-Id: Ie854181f45d8b7d8684ed1da4c96b8ac1b644646
Reviewed-on: https://chromium-review.googlesource.com/725700Reviewed-by: default avatarDominic Mazzoni <dmazzoni@chromium.org>
Reviewed-by: default avatarBence Béky <bnc@chromium.org>
Commit-Queue: Daniel Bratell <bratell@opera.com>
Cr-Commit-Position: refs/heads/master@{#510203}
parent 3ccdaef7
......@@ -115,9 +115,10 @@ std::unique_ptr<base::DictionaryValue> BuildTargetDescriptor(
accessibility_mode);
}
bool HandleRequestCallback(BrowserContext* current_context,
const std::string& path,
const WebUIDataSource::GotDataCallback& callback) {
bool HandleAccessibilityRequestCallback(
BrowserContext* current_context,
const std::string& path,
const WebUIDataSource::GotDataCallback& callback) {
if (path != kTargetsDataFile)
return false;
std::unique_ptr<base::ListValue> rvh_list(new base::ListValue());
......@@ -201,7 +202,7 @@ AccessibilityUI::AccessibilityUI(WebUI* web_ui) : WebUIController(web_ui) {
html_source->AddResourcePath("accessibility.js", IDR_ACCESSIBILITY_JS);
html_source->SetDefaultResource(IDR_ACCESSIBILITY_HTML);
html_source->SetRequestFilter(
base::Bind(&HandleRequestCallback,
base::Bind(&HandleAccessibilityRequestCallback,
web_ui->GetWebContents()->GetBrowserContext()));
html_source->UseGzip({kTargetsDataFile});
......
......@@ -57,9 +57,10 @@ std::unique_ptr<base::ListValue> GetNetworkErrorData() {
return error_list;
}
bool HandleRequestCallback(BrowserContext* current_context,
const std::string& path,
const WebUIDataSource::GotDataCallback& callback) {
bool HandleWebUIRequestCallback(
BrowserContext* current_context,
const std::string& path,
const WebUIDataSource::GotDataCallback& callback) {
if (path != kNetworkErrorDataFile)
return false;
......@@ -87,7 +88,7 @@ NetworkErrorsListingUI::NetworkErrorsListingUI(WebUI* web_ui)
IDR_NETWORK_ERROR_LISTING_JS);
html_source->SetDefaultResource(IDR_NETWORK_ERROR_LISTING_HTML);
html_source->SetRequestFilter(
base::Bind(&HandleRequestCallback,
base::Bind(&HandleWebUIRequestCallback,
web_ui->GetWebContents()->GetBrowserContext()));
BrowserContext* browser_context =
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment