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

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 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 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
379 // Creates a full screen RenderWidget. 382 // Creates a full screen RenderWidget.
380 void CreateNewFullscreenWidget(int route_id); 383 void CreateNewFullscreenWidget(int route_id);
381 384
382 #if defined(OS_MACOSX) 385 #if defined(OS_MACOSX)
383 // Select popup menu related methods (for external popup menus). 386 // Select popup menu related methods (for external popup menus).
384 void DidSelectPopupMenuItem(int selected_index); 387 void DidSelectPopupMenuItem(int selected_index);
385 void DidCancelPopupMenu(); 388 void DidCancelPopupMenu();
386 #endif 389 #endif
387 390
388 #if defined(OS_ANDROID) 391 #if defined(OS_ANDROID)
392 MediaPlayerManagerAndroid* media_player_manager() {
393 return media_player_manager_;
394 }
395
389 void DidSelectPopupMenuItems(const std::vector<int>& selected_indices); 396 void DidSelectPopupMenuItems(const std::vector<int>& selected_indices);
390 void DidCancelPopupMenu(); 397 void DidCancelPopupMenu();
391 #endif 398 #endif
392 399
393 // User rotated the screen. Calls the "onorientationchange" Javascript hook. 400 // User rotated the screen. Calls the "onorientationchange" Javascript hook.
394 void SendOrientationChangeEvent(int orientation); 401 void SendOrientationChangeEvent(int orientation);
395 402
396 const std::string& frame_tree() const { 403 const std::string& frame_tree() const {
397 return frame_tree_; 404 return frame_tree_;
398 } 405 }
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
656 // player_cookie passed to OnMediaNotification, value is the PowerSaveBlocker. 663 // player_cookie passed to OnMediaNotification, value is the PowerSaveBlocker.
657 typedef std::map<int64, PowerSaveBlocker*> PowerSaveBlockerMap; 664 typedef std::map<int64, PowerSaveBlocker*> PowerSaveBlockerMap;
658 PowerSaveBlockerMap power_save_blockers_; 665 PowerSaveBlockerMap power_save_blockers_;
659 666
660 // A list of observers that filter messages. Weak references. 667 // A list of observers that filter messages. Weak references.
661 ObserverList<RenderViewHostObserver> observers_; 668 ObserverList<RenderViewHostObserver> observers_;
662 669
663 // When the last ShouldClose message was sent. 670 // When the last ShouldClose message was sent.
664 base::TimeTicks send_should_close_start_time_; 671 base::TimeTicks send_should_close_start_time_;
665 672
673 #if defined(OS_ANDROID)
674 // Manages all the android mediaplayer objects and handling IPCs for video.
675 MediaPlayerManagerAndroid* media_player_manager_;
scherkus (not reviewing) 2012/09/07 13:17:35 who owns this object? do we leak it?
qinmin 2012/09/07 22:48:27 This object is inherited from RenderViewHostObserv
676 #endif
677
666 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImpl); 678 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImpl);
667 }; 679 };
668 680
669 #if defined(COMPILER_MSVC) 681 #if defined(COMPILER_MSVC)
670 #pragma warning(pop) 682 #pragma warning(pop)
671 #endif 683 #endif
672 684
673 } // namespace content 685 } // namespace content
674 686
675 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_ 687 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698