content/renderer/media/cdm/pepper_cdm_wrapper_impl.cc - Issue 2412493003: Revert of Move ENABLE_PEPPER_CDMS to a buildflag header.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: content/renderer/media/cdm/pepper_cdm_wrapper_impl.cc

Issue 2412493003: Revert of Move ENABLE_PEPPER_CDMS to a buildflag header. (Closed)

Patch Set: Created 4 years, 2 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 unified diff | Download patch

« no previous file with comments | « content/renderer/media/cdm/pepper_cdm_wrapper_impl.h ('k') | content/renderer/media/cdm/render_cdm_factory.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "ppapi/features/features.h"	5 #if defined(ENABLE_PEPPER_CDMS)

6

7 #if BUILDFLAG(ENABLE_PEPPER_CDMS)

8 #include "content/renderer/media/cdm/pepper_cdm_wrapper_impl.h"	6 #include "content/renderer/media/cdm/pepper_cdm_wrapper_impl.h"

9	7

10 #include <utility>	8 #include <utility>

11	9

12 #include "content/renderer/pepper/pepper_plugin_instance_impl.h"	10 #include "content/renderer/pepper/pepper_plugin_instance_impl.h"

13 #include "content/renderer/pepper/pepper_webplugin_impl.h"	11 #include "content/renderer/pepper/pepper_webplugin_impl.h"

14 #include "third_party/WebKit/public/platform/URLConversion.h"	12 #include "third_party/WebKit/public/platform/URLConversion.h"

15 #include "third_party/WebKit/public/platform/WebString.h"	13 #include "third_party/WebKit/public/platform/WebString.h"

16 #include "third_party/WebKit/public/web/WebDocument.h"	14 #include "third_party/WebKit/public/web/WebDocument.h"

17 #include "third_party/WebKit/public/web/WebElement.h"	15 #include "third_party/WebKit/public/web/WebElement.h"

(...skipping 71 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
89 plugin_instance_ = NULL;	87 plugin_instance_ = NULL;

90 helper_plugin_.reset();	88 helper_plugin_.reset();

91 }	89 }

92	90

93 ContentDecryptorDelegate* PepperCdmWrapperImpl::GetCdmDelegate() {	91 ContentDecryptorDelegate* PepperCdmWrapperImpl::GetCdmDelegate() {

94 return plugin_instance_->GetContentDecryptorDelegate();	92 return plugin_instance_->GetContentDecryptorDelegate();

95 }	93 }

96	94

97 } // namespace content	95 } // namespace content

98	96

99 #endif // BUILDFLAG(ENABLE_PEPPER_CDMS)	97 #endif // defined(ENABLE_PEPPER_CDMS)

OLD	NEW