Index: chrome/browser/permissions/permission_manager.cc |
diff --git a/chrome/browser/permissions/permission_manager.cc b/chrome/browser/permissions/permission_manager.cc |
index fdb5d34f98358b6ee40bb893627145fad2f82c3d..db1c35d51cac395904539b655f3cce06c97ce26d 100644 |
--- a/chrome/browser/permissions/permission_manager.cc |
+++ b/chrome/browser/permissions/permission_manager.cc |
@@ -18,6 +18,7 @@ |
#include "chrome/browser/permissions/permission_manager_factory.h" |
#include "chrome/browser/permissions/permission_request_id.h" |
#include "chrome/browser/permissions/permission_uma_util.h" |
+#include "chrome/browser/plugins/plugins_permission_context.h" |
#include "chrome/browser/profiles/profile.h" |
#include "chrome/browser/storage/durable_storage_permission_context.h" |
#include "chrome/browser/tab_contents/tab_util.h" |
@@ -99,6 +100,8 @@ ContentSettingsType PermissionTypeToContentSetting(PermissionType permission) { |
return CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA; |
case PermissionType::BACKGROUND_SYNC: |
return CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC; |
+ case PermissionType::PLUGINS: |
+ return CONTENT_SETTINGS_TYPE_PLUGINS; |
case PermissionType::NUM: |
// This will hit the NOTREACHED below. |
break; |
@@ -248,6 +251,8 @@ PermissionManager::PermissionManager(Profile* profile) |
CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA)); |
permission_contexts_[PermissionType::BACKGROUND_SYNC] = |
base::WrapUnique(new BackgroundSyncPermissionContext(profile)); |
+ permission_contexts_[PermissionType::PLUGINS] = |
+ base::WrapUnique(new PluginsPermissionContext(profile)); |
} |
PermissionManager::~PermissionManager() { |