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

Side by Side Diff: content/browser/renderer_host/render_view_host_impl.h

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 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 <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 class ListValue; 43 class ListValue;
44 } 44 }
45 45
46 namespace ui { 46 namespace ui {
47 class Range; 47 class Range;
48 struct SelectedFileInfo; 48 struct SelectedFileInfo;
49 } 49 }
50 50
51 namespace content { 51 namespace content {
52 52
53 #if defined(OS_ANDROID)
54 class MediaPlayerManagerAndroid;
55 #endif
53 class PowerSaveBlocker; 56 class PowerSaveBlocker;
54 class RenderViewHostObserver; 57 class RenderViewHostObserver;
55 class RenderWidgetHostDelegate; 58 class RenderWidgetHostDelegate;
56 class SessionStorageNamespace; 59 class SessionStorageNamespace;
57 class TestRenderViewHost; 60 class TestRenderViewHost;
58 struct ContextMenuParams; 61 struct ContextMenuParams;
59 struct FileChooserParams; 62 struct FileChooserParams;
60 struct Referrer; 63 struct Referrer;
61 struct ShowDesktopNotificationHostMsgParams; 64 struct ShowDesktopNotificationHostMsgParams;
62 65
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 // Creates a full screen RenderWidget. 394 // Creates a full screen RenderWidget.
392 void CreateNewFullscreenWidget(int route_id); 395 void CreateNewFullscreenWidget(int route_id);
393 396
394 #if defined(OS_MACOSX) 397 #if defined(OS_MACOSX)
395 // Select popup menu related methods (for external popup menus). 398 // Select popup menu related methods (for external popup menus).
396 void DidSelectPopupMenuItem(int selected_index); 399 void DidSelectPopupMenuItem(int selected_index);
397 void DidCancelPopupMenu(); 400 void DidCancelPopupMenu();
398 #endif 401 #endif
399 402
400 #if defined(OS_ANDROID) 403 #if defined(OS_ANDROID)
404 MediaPlayerManagerAndroid* media_player_manager() {
405 return media_player_manager_;
406 }
407
401 void DidSelectPopupMenuItems(const std::vector<int>& selected_indices); 408 void DidSelectPopupMenuItems(const std::vector<int>& selected_indices);
402 void DidCancelPopupMenu(); 409 void DidCancelPopupMenu();
403 #endif 410 #endif
404 411
405 // User rotated the screen. Calls the "onorientationchange" Javascript hook. 412 // User rotated the screen. Calls the "onorientationchange" Javascript hook.
406 void SendOrientationChangeEvent(int orientation); 413 void SendOrientationChangeEvent(int orientation);
407 414
408 const std::string& frame_tree() const { 415 const std::string& frame_tree() const {
409 return frame_tree_; 416 return frame_tree_;
410 } 417 }
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
668 // player_cookie passed to OnMediaNotification, value is the PowerSaveBlocker. 675 // player_cookie passed to OnMediaNotification, value is the PowerSaveBlocker.
669 typedef std::map<int64, PowerSaveBlocker*> PowerSaveBlockerMap; 676 typedef std::map<int64, PowerSaveBlocker*> PowerSaveBlockerMap;
670 PowerSaveBlockerMap power_save_blockers_; 677 PowerSaveBlockerMap power_save_blockers_;
671 678
672 // A list of observers that filter messages. Weak references. 679 // A list of observers that filter messages. Weak references.
673 ObserverList<RenderViewHostObserver> observers_; 680 ObserverList<RenderViewHostObserver> observers_;
674 681
675 // When the last ShouldClose message was sent. 682 // When the last ShouldClose message was sent.
676 base::TimeTicks send_should_close_start_time_; 683 base::TimeTicks send_should_close_start_time_;
677 684
685 #if defined(OS_ANDROID)
686 // Manages all the android mediaplayer objects and handling IPCs for video.
687 // This class inherits from RenderViewHostObserver.
688 MediaPlayerManagerAndroid* media_player_manager_;
689 #endif
690
678 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImpl); 691 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImpl);
679 }; 692 };
680 693
681 #if defined(COMPILER_MSVC) 694 #if defined(COMPILER_MSVC)
682 #pragma warning(pop) 695 #pragma warning(pop)
683 #endif 696 #endif
684 697
685 } // namespace content 698 } // namespace content
686 699
687 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_ 700 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_process_host_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