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

Unified Diff: chrome/browser/media/protected_media_identifier_permission_context.cc

Issue 893723002: media: Remove extension code in ProtectedMediaIdentifierPermissionContext. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/media/protected_media_identifier_permission_context.cc
diff --git a/chrome/browser/media/protected_media_identifier_permission_context.cc b/chrome/browser/media/protected_media_identifier_permission_context.cc
index 54e69e04c2f781f230236f6ca4a788b953dda8da..4ca5630d14e2ac9984f8e04265c2931109ceab8e 100644
--- a/chrome/browser/media/protected_media_identifier_permission_context.cc
+++ b/chrome/browser/media/protected_media_identifier_permission_context.cc
@@ -12,16 +12,6 @@
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/web_contents.h"
-#if defined(ENABLE_EXTENSIONS)
-#include "chrome/browser/extensions/extension_service.h"
-#include "extensions/browser/extension_system.h"
-#include "extensions/browser/suggest_permission_util.h"
-#include "extensions/browser/view_type_utils.h"
-#include "extensions/common/extension.h"
-
-using extensions::APIPermission;
-#endif
-
ProtectedMediaIdentifierPermissionContext::
ProtectedMediaIdentifierPermissionContext(Profile* profile)
: PermissionContextBase(profile,
@@ -40,21 +30,6 @@ void ProtectedMediaIdentifierPermissionContext::RequestPermission(
const BrowserPermissionCallback& callback) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-#if defined(ENABLE_EXTENSIONS)
- if (extensions::GetViewType(web_contents) !=
- extensions::VIEW_TYPE_TAB_CONTENTS) {
- // The tab may have gone away, or the request may not be from a tab at all.
- DVLOG(1)
- << "Attempt to use protected media identifier in tabless renderer: "
- << id.ToString()
- << " (can't prompt user without a visible tab)";
- NotifyPermissionSet(id, requesting_frame_origin,
- web_contents->GetLastCommittedURL().GetOrigin(),
- callback, false, false);
- return;
- }
-#endif
-
#if defined(OS_ANDROID)
// Check if the protected media identifier master switch is disabled.
if (!profile()->GetPrefs()->GetBoolean(
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698