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

Unified Diff: content/browser/renderer_host/render_view_host_impl.h

Issue 14314020: Rename MediaPlayerBridgeManager to MediaPlayerManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: additional rebase conflict Created 7 years, 8 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: content/browser/renderer_host/render_view_host_impl.h
diff --git a/content/browser/renderer_host/render_view_host_impl.h b/content/browser/renderer_host/render_view_host_impl.h
index 067b973ad4fe73732ebaf32a97516eb0bb52bce3..ec1dc69c6c18b16f6a00ad7db594448e6f62886c 100644
--- a/content/browser/renderer_host/render_view_host_impl.h
+++ b/content/browser/renderer_host/render_view_host_impl.h
@@ -66,7 +66,7 @@ struct Referrer;
struct ShowDesktopNotificationHostMsgParams;
#if defined(OS_ANDROID)
-class MediaPlayerManagerAndroid;
+class MediaPlayerManagerImpl;
#endif
#if defined(COMPILER_MSVC)
@@ -378,7 +378,7 @@ class CONTENT_EXPORT RenderViewHostImpl
#endif
#if defined(OS_ANDROID)
- MediaPlayerManagerAndroid* media_player_manager() {
+ MediaPlayerManagerImpl* media_player_manager() {
return media_player_manager_;
}
@@ -672,7 +672,7 @@ class CONTENT_EXPORT RenderViewHostImpl
#if defined(OS_ANDROID)
// Manages all the android mediaplayer objects and handling IPCs for video.
// This class inherits from RenderViewHostObserver.
- MediaPlayerManagerAndroid* media_player_manager_;
+ MediaPlayerManagerImpl* media_player_manager_;
#endif
DISALLOW_COPY_AND_ASSIGN(RenderViewHostImpl);
« no previous file with comments | « content/browser/android/surface_texture_peer_browser_impl.cc ('k') | content/browser/renderer_host/render_view_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698