chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc - Issue 1871343002: Remove PermissionContext factories

Unified Diff: chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc

Issue 1871343002: Remove PermissionContext factories (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 8 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

« chrome/browser/chromeos/attestation/platform_verification_flow.cc ('K') | « chrome/browser/geolocation/geolocation_permission_context_unittest.cc ('k') | chrome/browser/media/media_permission.cc » ('j') | chrome/browser/media/media_permission.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc

diff --git a/chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc b/chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc

index febbb01a492977aaaecb5ac7fa4bc860fb981047..8524e2a8c0e2af79882804d9f29baa150a89fff8 100644

--- a/chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc

+++ b/chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc

@@ -5,8 +5,9 @@

#include "chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.h"

#include "chrome/browser/content_settings/tab_specific_content_settings.h"

-#include "chrome/browser/geolocation/geolocation_permission_context.h"

-#include "chrome/browser/geolocation/geolocation_permission_context_factory.h"

+#include "chrome/browser/permissions/permission_context_base.h"

+#include "chrome/browser/permissions/permission_manager.h"

+#include "chrome/browser/permissions/permission_manager_factory.h"

#include "chrome/browser/permissions/permission_request_id.h"

#include "chrome/browser/plugins/chrome_plugin_service_filter.h"

#include "chrome/browser/profiles/profile.h"

@@ -226,13 +227,14 @@ void ChromeWebViewPermissionHelperDelegate::OnGeolocationPermissionResponse(

Profile* profile = Profile::FromBrowserContext(

web_view_guest()->browser_context());

- GeolocationPermissionContextFactory::GetForProfile(profile)->

- RequestPermission(

- web_contents,

- request_id,

- web_view_guest()->embedder_web_contents()

- ->GetLastCommittedURL().GetOrigin(),

- callback);

+ PermissionManagerFactory::GetForProfile(profile)

+ ->GetPermissionContext(content::PermissionType::GEOLOCATION)

mlamouri (slow - plz ping) 2016/04/11 14:06:05 As above, this could be: PermissionManager::Get(pr

raymes 2016/04/12 07:44:54 Done.

+ ->RequestPermission(web_contents, request_id,

+ web_view_guest()

+ ->embedder_web_contents()

+ ->GetLastCommittedURL()

+ .GetOrigin(),

+ callback);

}

void ChromeWebViewPermissionHelperDelegate::CancelGeolocationPermissionRequest(