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

Unified Diff: content/child/blink_platform_impl.cc

Issue 2108003002: Merge //content/child/permissions into Blink's permissions module. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased. Created 4 years, 5 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 | « content/child/blink_platform_impl.h ('k') | content/child/permissions/OWNERS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/blink_platform_impl.cc
diff --git a/content/child/blink_platform_impl.cc b/content/child/blink_platform_impl.cc
index 3fd72bf36828da6e99a8acaf5f2092048e7d3033..ba47d22d5103b2f70bcbd41dd6b72f2efbb558f2 100644
--- a/content/child/blink_platform_impl.cc
+++ b/content/child/blink_platform_impl.cc
@@ -44,8 +44,6 @@
#include "content/child/content_child_helpers.h"
#include "content/child/notifications/notification_dispatcher.h"
#include "content/child/notifications/notification_manager.h"
-#include "content/child/permissions/permission_dispatcher.h"
-#include "content/child/permissions/permission_dispatcher_thread_proxy.h"
#include "content/child/push_messaging/push_dispatcher.h"
#include "content/child/push_messaging/push_provider.h"
#include "content/child/thread_safe_sender.h"
@@ -386,8 +384,6 @@ void BlinkPlatformImpl::InternalInit() {
notification_dispatcher_ =
ChildThreadImpl::current()->notification_dispatcher();
push_dispatcher_ = ChildThreadImpl::current()->push_dispatcher();
- permission_client_.reset(new PermissionDispatcher(
- ChildThreadImpl::current()->GetRemoteInterfaces()));
main_thread_sync_provider_.reset(
new BackgroundSyncProvider(main_thread_task_runner_.get()));
}
@@ -881,17 +877,6 @@ blink::WebPushProvider* BlinkPlatformImpl::pushProvider() {
push_dispatcher_.get());
}
-blink::WebPermissionClient* BlinkPlatformImpl::permissionClient() {
- if (!permission_client_.get())
- return nullptr;
-
- if (IsMainThread())
- return permission_client_.get();
-
- return PermissionDispatcherThreadProxy::GetThreadInstance(
- main_thread_task_runner_.get(), permission_client_.get());
-}
-
blink::WebSyncProvider* BlinkPlatformImpl::backgroundSyncProvider() {
if (IsMainThread())
return main_thread_sync_provider_.get();
« no previous file with comments | « content/child/blink_platform_impl.h ('k') | content/child/permissions/OWNERS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698