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

Side by Side 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, 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 class RenderWidgetHostDelegate; 59 class RenderWidgetHostDelegate;
60 class SessionStorageNamespace; 60 class SessionStorageNamespace;
61 class SessionStorageNamespaceImpl; 61 class SessionStorageNamespaceImpl;
62 class TestRenderViewHost; 62 class TestRenderViewHost;
63 struct ContextMenuParams; 63 struct ContextMenuParams;
64 struct FileChooserParams; 64 struct FileChooserParams;
65 struct Referrer; 65 struct Referrer;
66 struct ShowDesktopNotificationHostMsgParams; 66 struct ShowDesktopNotificationHostMsgParams;
67 67
68 #if defined(OS_ANDROID) 68 #if defined(OS_ANDROID)
69 class MediaPlayerManagerAndroid; 69 class MediaPlayerManagerImpl;
70 #endif 70 #endif
71 71
72 #if defined(COMPILER_MSVC) 72 #if defined(COMPILER_MSVC)
73 // RenderViewHostImpl is the bottom of a diamond-shaped hierarchy, 73 // RenderViewHostImpl is the bottom of a diamond-shaped hierarchy,
74 // with RenderWidgetHost at the root. VS warns when methods from the 74 // with RenderWidgetHost at the root. VS warns when methods from the
75 // root are overridden in only one of the base classes and not both 75 // root are overridden in only one of the base classes and not both
76 // (in this case, RenderWidgetHostImpl provides implementations of 76 // (in this case, RenderWidgetHostImpl provides implementations of
77 // many of the methods). This is a silly warning when dealing with 77 // many of the methods). This is a silly warning when dealing with
78 // pure virtual methods that only have a single implementation in the 78 // pure virtual methods that only have a single implementation in the
79 // hierarchy above this class, and is safe to ignore in this case. 79 // hierarchy above this class, and is safe to ignore in this case.
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 // Creates a full screen RenderWidget. 371 // Creates a full screen RenderWidget.
372 void CreateNewFullscreenWidget(int route_id); 372 void CreateNewFullscreenWidget(int route_id);
373 373
374 #if defined(OS_MACOSX) 374 #if defined(OS_MACOSX)
375 // Select popup menu related methods (for external popup menus). 375 // Select popup menu related methods (for external popup menus).
376 void DidSelectPopupMenuItem(int selected_index); 376 void DidSelectPopupMenuItem(int selected_index);
377 void DidCancelPopupMenu(); 377 void DidCancelPopupMenu();
378 #endif 378 #endif
379 379
380 #if defined(OS_ANDROID) 380 #if defined(OS_ANDROID)
381 MediaPlayerManagerAndroid* media_player_manager() { 381 MediaPlayerManagerImpl* media_player_manager() {
382 return media_player_manager_; 382 return media_player_manager_;
383 } 383 }
384 384
385 void DidSelectPopupMenuItems(const std::vector<int>& selected_indices); 385 void DidSelectPopupMenuItems(const std::vector<int>& selected_indices);
386 void DidCancelPopupMenu(); 386 void DidCancelPopupMenu();
387 #endif 387 #endif
388 388
389 // User rotated the screen. Calls the "onorientationchange" Javascript hook. 389 // User rotated the screen. Calls the "onorientationchange" Javascript hook.
390 void SendOrientationChangeEvent(int orientation); 390 void SendOrientationChangeEvent(int orientation);
391 391
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
665 665
666 // A list of observers that filter messages. Weak references. 666 // A list of observers that filter messages. Weak references.
667 ObserverList<RenderViewHostObserver> observers_; 667 ObserverList<RenderViewHostObserver> observers_;
668 668
669 // When the last ShouldClose message was sent. 669 // When the last ShouldClose message was sent.
670 base::TimeTicks send_should_close_start_time_; 670 base::TimeTicks send_should_close_start_time_;
671 671
672 #if defined(OS_ANDROID) 672 #if defined(OS_ANDROID)
673 // Manages all the android mediaplayer objects and handling IPCs for video. 673 // Manages all the android mediaplayer objects and handling IPCs for video.
674 // This class inherits from RenderViewHostObserver. 674 // This class inherits from RenderViewHostObserver.
675 MediaPlayerManagerAndroid* media_player_manager_; 675 MediaPlayerManagerImpl* media_player_manager_;
676 #endif 676 #endif
677 677
678 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImpl); 678 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImpl);
679 }; 679 };
680 680
681 #if defined(COMPILER_MSVC) 681 #if defined(COMPILER_MSVC)
682 #pragma warning(pop) 682 #pragma warning(pop)
683 #endif 683 #endif
684 684
685 } // namespace content 685 } // namespace content
686 686
687 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_ 687 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_
OLDNEW
« 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