third_party/WebKit/Source/web/WebLocalFrameImpl.cpp - Issue 2108003002: Merge //content/child/permissions into Blink's permissions module.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

Issue 2108003002: Merge //content/child/permissions into Blink's permissions module. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixing presubmits. Created 4 years, 6 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

« third_party/WebKit/Source/modules/quota/StorageManager.cpp ('K') | « third_party/WebKit/Source/modules/quota/StorageManager.cpp ('k') | third_party/WebKit/public/blink_headers.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

diff --git a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

index 22177d12d8da84500e1c6e0aee686d984b552218..22392665f35ae3c8d9a41dcd833cc4f8cdfa122f 100644

--- a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

+++ b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

@@ -157,7 +157,6 @@

#include "modules/bluetooth/BluetoothSupplement.h"

#include "modules/installedapp/InstalledAppController.h"

#include "modules/notifications/NotificationPermissionClient.h"

-#include "modules/permissions/PermissionController.h"

#include "modules/presentation/PresentationController.h"

#include "modules/push_messaging/PushController.h"

#include "modules/screen_orientation/ScreenOrientationController.h"

@@ -1484,8 +1483,6 @@ void WebLocalFrameImpl::setCoreFrame(LocalFrame* frame)

ScreenOrientationController::provideTo(*m_frame, m_client ? m_client->webScreenOrientationClient() : nullptr);

if (RuntimeEnabledFeatures::presentationEnabled())

PresentationController::provideTo(*m_frame, m_client ? m_client->presentationClient() : nullptr);

- if (RuntimeEnabledFeatures::permissionsEnabled())

- PermissionController::provideTo(*m_frame, m_client ? m_client->permissionClient() : nullptr);

if (RuntimeEnabledFeatures::webVREnabled())

VRController::provideTo(*m_frame, m_client ? m_client->serviceRegistry() : nullptr);

if (RuntimeEnabledFeatures::wakeLockEnabled())