Commit 0cebd109 authored by Daniel Bratell's avatar Daniel Bratell Committed by Commit Bot

Renamed local BindInterface since it clashed with template

There is a template named BindInterface in
content/public/common/bind_interface_helpers.h so to avoid
compilation failures when that header is included directly
or indirectly (as in jumbo builds), it's better to call
local functions something else than BindInterface.

This renames BindInterface -> BindNamedInterface.

Bug: 746953
Change-Id: Ib595232b8c6c9ae58b5321ff58ad1c2927787631
Reviewed-on: https://chromium-review.googlesource.com/822433Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Commit-Queue: Daniel Bratell <bratell@opera.com>
Cr-Commit-Position: refs/heads/master@{#523721}
parent b82b27ff
...@@ -17,7 +17,7 @@ namespace content { ...@@ -17,7 +17,7 @@ namespace content {
namespace { namespace {
void BindInterface(base::WeakPtr<service_manager::Connector> connector, void BindNamedInterface(base::WeakPtr<service_manager::Connector> connector,
const std::string& name, const std::string& name,
mojo::ScopedMessagePipeHandle handle) { mojo::ScopedMessagePipeHandle handle) {
if (!connector) if (!connector)
...@@ -43,7 +43,7 @@ void BlinkInterfaceProviderImpl::GetInterface( ...@@ -43,7 +43,7 @@ void BlinkInterfaceProviderImpl::GetInterface(
mojo::ScopedMessagePipeHandle handle) { mojo::ScopedMessagePipeHandle handle) {
// Construct a closure that can safely be passed across threads if necessary. // Construct a closure that can safely be passed across threads if necessary.
base::OnceClosure closure = base::BindOnce( base::OnceClosure closure = base::BindOnce(
&BindInterface, connector_, std::string(name), std::move(handle)); &BindNamedInterface, connector_, std::string(name), std::move(handle));
if (main_thread_task_runner_->BelongsToCurrentThread()) { if (main_thread_task_runner_->BelongsToCurrentThread()) {
std::move(closure).Run(); std::move(closure).Run();
......
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