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

Unified Diff: content/renderer/pepper/content_decryptor_delegate.cc

Issue 20165002: Move webkit/plugins/ppapi to content/renderer/pepper. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: more more clang fun Created 7 years, 5 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 | « content/renderer/pepper/content_decryptor_delegate.h ('k') | content/renderer/pepper/event_conversion.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/pepper/content_decryptor_delegate.cc
===================================================================
--- content/renderer/pepper/content_decryptor_delegate.cc (revision 213482)
+++ content/renderer/pepper/content_decryptor_delegate.cc (working copy)
@@ -2,12 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "webkit/plugins/ppapi/content_decryptor_delegate.h"
+#include "content/renderer/pepper/content_decryptor_delegate.h"
#include "base/callback_helpers.h"
#include "base/debug/trace_event.h"
#include "base/message_loop/message_loop_proxy.h"
#include "base/safe_numerics.h"
+#include "content/renderer/pepper/ppb_buffer_impl.h"
#include "media/base/audio_buffer.h"
#include "media/base/audio_decoder_config.h"
#include "media/base/bind_to_loop.h"
@@ -24,7 +25,6 @@
#include "ppapi/thunk/enter.h"
#include "ppapi/thunk/ppb_buffer_api.h"
#include "ui/gfx/rect.h"
-#include "webkit/plugins/ppapi/ppb_buffer_impl.h"
using ppapi::ArrayBufferVar;
using ppapi::PpapiGlobals;
@@ -241,6 +241,9 @@
audio_bytes_per_frame_(0) {
}
+ContentDecryptorDelegate::~ContentDecryptorDelegate() {
+}
+
void ContentDecryptorDelegate::Initialize(const std::string& key_system) {
// TODO(ddorwin): Add an Initialize method to PPP_ContentDecryptor_Private.
DCHECK(!key_system.empty());
« no previous file with comments | « content/renderer/pepper/content_decryptor_delegate.h ('k') | content/renderer/pepper/event_conversion.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698