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

Unified Diff: chrome/renderer/chrome_render_process_observer.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
« no previous file with comments | « no previous file | content/browser/android/browser_jni_registrar.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/chrome_render_process_observer.cc
diff --git a/chrome/renderer/chrome_render_process_observer.cc b/chrome/renderer/chrome_render_process_observer.cc
index 128ecd5f12da4ca4bdb9c2c87e431d1d1a4857e5..02da00f9dcc65cb335cf2c8e53da37b395f4cbae 100644
--- a/chrome/renderer/chrome_render_process_observer.cc
+++ b/chrome/renderer/chrome_render_process_observer.cc
@@ -45,10 +45,6 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
#include "v8/include/v8.h"
-#if defined(OS_ANDROID)
-#include "webkit/media/android/webmediaplayer_android.h"
-#endif
-
#if defined(OS_WIN)
#include "base/win/iat_patch_function.h"
#endif
@@ -242,9 +238,6 @@ bool ChromeRenderProcessObserver::OnControlMessageReceived(
void ChromeRenderProcessObserver::OnSetIsIncognitoProcess(
bool is_incognito_process) {
is_incognito_process_ = is_incognito_process;
-#if defined(OS_ANDROID)
- webkit_media::WebMediaPlayerAndroid::InitIncognito(is_incognito_process_);
-#endif
}
void ChromeRenderProcessObserver::OnSetContentSettingRules(
« no previous file with comments | « no previous file | content/browser/android/browser_jni_registrar.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698