Chromium Code Reviews| 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..03b5eae807ae323f00cdfd5766ad2601f8697ea1 100644 |
| --- a/chrome/browser/media/media_permission.cc |
| +++ b/chrome/browser/media/media_permission.cc |
| @@ -7,8 +7,9 @@ |
| #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/permissions/permission_manager_factory.h" |
| #include "chrome/browser/profiles/profile.h" |
| #include "chrome/common/pref_names.h" |
| #include "content/public/browser/permission_manager.h" |
| @@ -55,7 +56,8 @@ ContentSetting MediaPermission::GetPermissionStatus( |
| content::PermissionType permission_type = |
| ContentSettingsTypeToPermission(content_type_); |
| PermissionContextBase* permission_context = |
| - PermissionContext::Get(profile_, permission_type); |
| + PermissionManagerFactory::GetForProfile(profile_)->GetPermissionContext( |
| + permission_type); |
|
mlamouri (slow - plz ping)
2016/04/11 14:06:05
Could that be moved to something like:
`Permission
raymes
2016/04/12 07:44:54
It's a bit too complicated to change this one righ
|
| if (!permission_context) { |
| *denial_reason = content::MEDIA_DEVICE_PERMISSION_DENIED; |