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

Unified Diff: media/base/android/cookie_getter.cc

Issue 10919075: Move android mediaplayer from render process to browser process. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressing comments and resolving merge conflicts Created 8 years, 3 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
Index: media/base/android/cookie_getter.cc
diff --git a/media/base/audio_decoder.cc b/media/base/android/cookie_getter.cc
similarity index 67%
copy from media/base/audio_decoder.cc
copy to media/base/android/cookie_getter.cc
index 939066078c4fec03c64ebb59b78c9c868ecc02e1..1db105a6e2761584aaae4efb10b2734add95be05 100644
--- a/media/base/audio_decoder.cc
+++ b/media/base/android/cookie_getter.cc
@@ -2,12 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "media/base/audio_decoder.h"
+#include "media/base/android/cookie_getter.h"
namespace media {
-AudioDecoder::AudioDecoder() {}
-
-AudioDecoder::~AudioDecoder() {}
+CookieGetter::~CookieGetter() {}
} // namespace media
« no previous file with comments | « media/base/android/cookie_getter.h ('k') | media/base/android/java/src/org/chromium/media/MediaPlayerListener.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698