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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/media/media_permission.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
« no previous file with comments | « chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc ('k') | chrome/browser/media/media_stream_camera_permission_context_factory.h » ('j') | chrome/browser/permissions/permission_manager.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/media/media_permission.cc
diff --git a/chrome/browser/media/media_permission.cc b/chrome/browser/media/media_permission.cc
index 4ba868139af7abe64962af4d0c8c6327c4c2a6ee..600151f6f89216a576d322a4e1862100b127bee1 100644
--- a/chrome/browser/media/media_permission.cc
+++ b/chrome/browser/media/media_permission.cc
@@ -7,8 +7,8 @@
#include "chrome/browser/media/media_capture_devices_dispatcher.h"
#include "chrome/browser/media/media_stream_device_permission_context.h"
#include "chrome/browser/media/media_stream_device_permissions.h"
-#include "chrome/browser/permissions/permission_context.h"
#include "chrome/browser/permissions/permission_context_base.h"
+#include "chrome/browser/permissions/permission_manager.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/pref_names.h"
#include "content/public/browser/permission_manager.h"
@@ -55,7 +55,7 @@ ContentSetting MediaPermission::GetPermissionStatus(
content::PermissionType permission_type =
ContentSettingsTypeToPermission(content_type_);
PermissionContextBase* permission_context =
- PermissionContext::Get(profile_, permission_type);
+ PermissionManager::Get(profile_)->GetPermissionContext(permission_type);
mlamouri (slow - plz ping) 2016/04/12 11:36:39 Add a TODO maybe?
raymes 2016/04/13 00:35:07 Done.
if (!permission_context) {
*denial_reason = content::MEDIA_DEVICE_PERMISSION_DENIED;
« no previous file with comments | « chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc ('k') | chrome/browser/media/media_stream_camera_permission_context_factory.h » ('j') | chrome/browser/permissions/permission_manager.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698