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

Side by Side Diff: content/renderer/render_view_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_RENDERER_RENDER_VIEW_IMPL_H_ 5 #ifndef CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
6 #define CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ 6 #define CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 class WebPluginDelegateProxy; 95 class WebPluginDelegateProxy;
96 class WebUIBindings; 96 class WebUIBindings;
97 97
98 namespace content { 98 namespace content {
99 class DocumentState; 99 class DocumentState;
100 class NavigationState; 100 class NavigationState;
101 class RenderViewObserver; 101 class RenderViewObserver;
102 class RenderViewTest; 102 class RenderViewTest;
103 class RendererAccessibility; 103 class RendererAccessibility;
104 class RendererPpapiHost; 104 class RendererPpapiHost;
105 #if defined(OS_ANDROID)
106 class WebMediaPlayerProxyImplAndroid;
107 #endif
105 struct CustomContextMenuContext; 108 struct CustomContextMenuContext;
106 struct FileChooserParams; 109 struct FileChooserParams;
107 110
108 namespace old { 111 namespace old {
109 class GuestToEmbedderChannel; 112 class GuestToEmbedderChannel;
110 } 113 }
111 114
112 } // namespace content 115 } // namespace content
113 116
114 namespace gfx { 117 namespace gfx {
(...skipping 14 matching lines...) Expand all
129 132
130 } // namespace webkit 133 } // namespace webkit
131 134
132 namespace webkit_glue { 135 namespace webkit_glue {
133 class ImageResourceFetcher; 136 class ImageResourceFetcher;
134 class ResourceFetcher; 137 class ResourceFetcher;
135 } 138 }
136 139
137 #if defined(OS_ANDROID) 140 #if defined(OS_ANDROID)
138 namespace webkit_media { 141 namespace webkit_media {
142 class MediaPlayerBridgeManagerImpl;
139 class WebMediaPlayerManagerAndroid; 143 class WebMediaPlayerManagerAndroid;
140 } 144 }
141 #endif 145 #endif
142 146
143 namespace WebKit { 147 namespace WebKit {
144 class WebApplicationCacheHost; 148 class WebApplicationCacheHost;
145 class WebApplicationCacheHostClient; 149 class WebApplicationCacheHostClient;
146 class WebCompositorOutputSurface; 150 class WebCompositorOutputSurface;
147 class WebDOMMessageEvent; 151 class WebDOMMessageEvent;
148 class WebDataSource; 152 class WebDataSource;
(...skipping 1251 matching lines...) Expand 10 before | Expand all | Expand 10 after
1400 // Android Specific --------------------------------------------------------- 1404 // Android Specific ---------------------------------------------------------
1401 1405
1402 // Expected id of the next content intent launched. Used to prevent scheduled 1406 // Expected id of the next content intent launched. Used to prevent scheduled
1403 // intents to be launched if aborted. 1407 // intents to be launched if aborted.
1404 size_t expected_content_intent_id_; 1408 size_t expected_content_intent_id_;
1405 1409
1406 // List of click-based content detectors. 1410 // List of click-based content detectors.
1407 typedef std::vector< linked_ptr<content::ContentDetector> > 1411 typedef std::vector< linked_ptr<content::ContentDetector> >
1408 ContentDetectorList; 1412 ContentDetectorList;
1409 ContentDetectorList content_detectors_; 1413 ContentDetectorList content_detectors_;
1414
1415 // Proxy class for WebMediaPlayer to communicate with the real media player
1416 // objects in browser process.
1417 content::WebMediaPlayerProxyImplAndroid* media_player_proxy_;
1418
1419 // The media player manager for managing all the media players on this view.
1420 scoped_ptr<webkit_media::WebMediaPlayerManagerAndroid> media_player_manager_;
1421
1422 // Resource manager for all the android media player objects if they are
1423 // created in the renderer process.
1424 scoped_ptr<webkit_media::MediaPlayerBridgeManagerImpl> media_bridge_manager_;
1410 #endif 1425 #endif
1411 1426
1412 // Misc ---------------------------------------------------------------------- 1427 // Misc ----------------------------------------------------------------------
1413 1428
1414 // The current and pending file chooser completion objects. If the queue is 1429 // The current and pending file chooser completion objects. If the queue is
1415 // nonempty, the first item represents the currently running file chooser 1430 // nonempty, the first item represents the currently running file chooser
1416 // callback, and the remaining elements are the other file chooser completion 1431 // callback, and the remaining elements are the other file chooser completion
1417 // still waiting to be run (in order). 1432 // still waiting to be run (in order).
1418 struct PendingFileChooser; 1433 struct PendingFileChooser;
1419 std::deque< linked_ptr<PendingFileChooser> > file_chooser_completions_; 1434 std::deque< linked_ptr<PendingFileChooser> > file_chooser_completions_;
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
1458 // is fine. 1473 // is fine.
1459 ObserverList<content::RenderViewObserver> observers_; 1474 ObserverList<content::RenderViewObserver> observers_;
1460 1475
1461 // Used to inform didChangeSelection() when it is called in the context 1476 // Used to inform didChangeSelection() when it is called in the context
1462 // of handling a ViewMsg_SelectRange IPC. 1477 // of handling a ViewMsg_SelectRange IPC.
1463 bool handling_select_range_; 1478 bool handling_select_range_;
1464 1479
1465 // Wraps the |webwidget_| as a MouseLockDispatcher::LockTarget interface. 1480 // Wraps the |webwidget_| as a MouseLockDispatcher::LockTarget interface.
1466 scoped_ptr<MouseLockDispatcher::LockTarget> webwidget_mouse_lock_target_; 1481 scoped_ptr<MouseLockDispatcher::LockTarget> webwidget_mouse_lock_target_;
1467 1482
1468 #if defined(OS_ANDROID)
1469 // The media player manager for managing all the media players on this view.
1470 scoped_ptr<webkit_media::WebMediaPlayerManagerAndroid> media_player_manager_;
1471 #endif
1472
1473 // Plugins ------------------------------------------------------------------- 1483 // Plugins -------------------------------------------------------------------
1474 1484
1475 // All the currently active plugin delegates for this RenderView; kept so 1485 // All the currently active plugin delegates for this RenderView; kept so
1476 // that we can enumerate them to send updates about things like window 1486 // that we can enumerate them to send updates about things like window
1477 // location or tab focus and visibily. These are non-owning references. 1487 // location or tab focus and visibily. These are non-owning references.
1478 std::set<WebPluginDelegateProxy*> plugin_delegates_; 1488 std::set<WebPluginDelegateProxy*> plugin_delegates_;
1479 1489
1480 #if defined(OS_WIN) 1490 #if defined(OS_WIN)
1481 // The ID of the focused NPAPI plug-in. 1491 // The ID of the focused NPAPI plug-in.
1482 int focused_plugin_id_; 1492 int focused_plugin_id_;
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
1542 // bunch of stuff, you should probably create a helper class and put your 1552 // bunch of stuff, you should probably create a helper class and put your
1543 // data and methods on that to avoid bloating RenderView more. You can 1553 // data and methods on that to avoid bloating RenderView more. You can
1544 // use the Observer interface to filter IPC messages and receive frame change 1554 // use the Observer interface to filter IPC messages and receive frame change
1545 // notifications. 1555 // notifications.
1546 // --------------------------------------------------------------------------- 1556 // ---------------------------------------------------------------------------
1547 1557
1548 DISALLOW_COPY_AND_ASSIGN(RenderViewImpl); 1558 DISALLOW_COPY_AND_ASSIGN(RenderViewImpl);
1549 }; 1559 };
1550 1560
1551 #endif // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ 1561 #endif // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
OLDNEW
« no previous file with comments | « content/renderer/media/webmediaplayer_proxy_impl_android.cc ('k') | content/renderer/render_view_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698