| Index: content/child/permissions/permission_dispatcher_thread_proxy.cc
|
| diff --git a/content/child/permissions/permission_manager_thread_proxy.cc b/content/child/permissions/permission_dispatcher_thread_proxy.cc
|
| similarity index 50%
|
| rename from content/child/permissions/permission_manager_thread_proxy.cc
|
| rename to content/child/permissions/permission_dispatcher_thread_proxy.cc
|
| index 8af0f23c128015d52788ce6b70185d86fa286c8d..1d8d96b204408e69ebb42f658b85bb038e895918 100644
|
| --- a/content/child/permissions/permission_manager_thread_proxy.cc
|
| +++ b/content/child/permissions/permission_dispatcher_thread_proxy.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "content/child/permissions/permission_manager_thread_proxy.h"
|
| +#include "content/child/permissions/permission_dispatcher_thread_proxy.h"
|
|
|
| #include "base/bind.h"
|
| #include "base/bind_helpers.h"
|
| @@ -10,7 +10,7 @@
|
| #include "base/location.h"
|
| #include "base/single_thread_task_runner.h"
|
| #include "base/threading/thread_local.h"
|
| -#include "content/child/permissions/permission_manager.h"
|
| +#include "content/child/permissions/permission_dispatcher.h"
|
| #include "content/child/worker_task_runner.h"
|
| #include "third_party/WebKit/public/platform/WebURL.h"
|
|
|
| @@ -21,53 +21,53 @@ namespace content {
|
|
|
| namespace {
|
|
|
| -LazyInstance<ThreadLocalPointer<PermissionManagerThreadProxy>>::Leaky
|
| - g_permission_manager_tls = LAZY_INSTANCE_INITIALIZER;
|
| +LazyInstance<ThreadLocalPointer<PermissionDispatcherThreadProxy>>::Leaky
|
| + g_permission_dispatcher_tls = LAZY_INSTANCE_INITIALIZER;
|
|
|
| } // anonymous namespace
|
|
|
| -PermissionManagerThreadProxy*
|
| -PermissionManagerThreadProxy::GetThreadInstance(
|
| +PermissionDispatcherThreadProxy*
|
| +PermissionDispatcherThreadProxy::GetThreadInstance(
|
| base::SingleThreadTaskRunner* main_thread_task_runner,
|
| - PermissionManager* permissions_manager) {
|
| - if (g_permission_manager_tls.Pointer()->Get())
|
| - return g_permission_manager_tls.Pointer()->Get();
|
| + PermissionDispatcher* permission_dispatcher) {
|
| + if (g_permission_dispatcher_tls.Pointer()->Get())
|
| + return g_permission_dispatcher_tls.Pointer()->Get();
|
|
|
| - PermissionManagerThreadProxy* instance =
|
| - new PermissionManagerThreadProxy(main_thread_task_runner,
|
| - permissions_manager);
|
| + PermissionDispatcherThreadProxy* instance =
|
| + new PermissionDispatcherThreadProxy(main_thread_task_runner,
|
| + permission_dispatcher);
|
| DCHECK(WorkerTaskRunner::Instance()->CurrentWorkerId());
|
| WorkerTaskRunner::Instance()->AddStopObserver(instance);
|
| return instance;
|
| }
|
|
|
| -PermissionManagerThreadProxy::PermissionManagerThreadProxy(
|
| +PermissionDispatcherThreadProxy::PermissionDispatcherThreadProxy(
|
| base::SingleThreadTaskRunner* main_thread_task_runner,
|
| - PermissionManager* permissions_manager)
|
| + PermissionDispatcher* permission_dispatcher)
|
| : main_thread_task_runner_(main_thread_task_runner),
|
| - permissions_manager_(permissions_manager) {
|
| - g_permission_manager_tls.Pointer()->Set(this);
|
| + permission_dispatcher_(permission_dispatcher) {
|
| + g_permission_dispatcher_tls.Pointer()->Set(this);
|
| }
|
|
|
| -PermissionManagerThreadProxy::~PermissionManagerThreadProxy() {
|
| - g_permission_manager_tls.Pointer()->Set(nullptr);
|
| +PermissionDispatcherThreadProxy::~PermissionDispatcherThreadProxy() {
|
| + g_permission_dispatcher_tls.Pointer()->Set(nullptr);
|
| }
|
|
|
| -void PermissionManagerThreadProxy::queryPermission(
|
| +void PermissionDispatcherThreadProxy::queryPermission(
|
| blink::WebPermissionType type,
|
| const blink::WebURL& origin,
|
| blink::WebPermissionQueryCallback* callback) {
|
| main_thread_task_runner_->PostTask(
|
| FROM_HERE,
|
| - base::Bind(&PermissionManager::QueryPermissionForWorker,
|
| - base::Unretained(permissions_manager_),
|
| + base::Bind(&PermissionDispatcher::QueryPermissionForWorker,
|
| + base::Unretained(permission_dispatcher_),
|
| type,
|
| origin.string().utf8(),
|
| base::Unretained(callback),
|
| WorkerTaskRunner::Instance()->CurrentWorkerId()));
|
| }
|
|
|
| -void PermissionManagerThreadProxy::OnWorkerRunLoopStopped() {
|
| +void PermissionDispatcherThreadProxy::OnWorkerRunLoopStopped() {
|
| delete this;
|
| }
|
|
|
|
|