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

Side by Side Diff: content/renderer/render_view_impl.h

Issue 10413015: Upstream implementation for embedded video for WebMediaPlayerAndroid (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase after https://chromiumcodereview.appspot.com/10469003/ got committed Created 8 years, 6 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
« no previous file with comments | « no previous file | content/renderer/render_view_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #pragma once 7 #pragma once
8 8
9 #include <deque> 9 #include <deque>
10 #include <map> 10 #include <map>
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 class WebPluginImpl; 115 class WebPluginImpl;
116 } // namespace ppapi 116 } // namespace ppapi
117 117
118 } // namespace webkit 118 } // namespace webkit
119 119
120 namespace webkit_glue { 120 namespace webkit_glue {
121 class ImageResourceFetcher; 121 class ImageResourceFetcher;
122 class ResourceFetcher; 122 class ResourceFetcher;
123 } 123 }
124 124
125 #if defined(OS_ANDROID)
126 namespace webkit_media {
127 class WebMediaPlayerManagerAndroid;
128 }
129 #endif
130
125 namespace WebKit { 131 namespace WebKit {
126 class WebApplicationCacheHost; 132 class WebApplicationCacheHost;
127 class WebApplicationCacheHostClient; 133 class WebApplicationCacheHostClient;
128 class WebDOMMessageEvent; 134 class WebDOMMessageEvent;
129 class WebDataSource; 135 class WebDataSource;
130 class WebDragData; 136 class WebDragData;
131 class WebGeolocationClient; 137 class WebGeolocationClient;
132 class WebIconURL; 138 class WebIconURL;
133 class WebImage; 139 class WebImage;
134 class WebPeerConnection00Handler; 140 class WebPeerConnection00Handler;
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 243
238 // Current P2PSocketDispatcher. Set to NULL if P2P API is disabled. 244 // Current P2PSocketDispatcher. Set to NULL if P2P API is disabled.
239 content::P2PSocketDispatcher* p2p_socket_dispatcher() { 245 content::P2PSocketDispatcher* p2p_socket_dispatcher() {
240 return p2p_socket_dispatcher_; 246 return p2p_socket_dispatcher_;
241 } 247 }
242 248
243 MouseLockDispatcher* mouse_lock_dispatcher() { 249 MouseLockDispatcher* mouse_lock_dispatcher() {
244 return mouse_lock_dispatcher_; 250 return mouse_lock_dispatcher_;
245 } 251 }
246 252
253 #if defined(OS_ANDROID)
254 webkit_media::WebMediaPlayerManagerAndroid* media_player_manager() {
255 return media_player_manager_.get();
256 }
257 #endif
258
247 WebKit::WebPeerConnectionHandler* CreatePeerConnectionHandler( 259 WebKit::WebPeerConnectionHandler* CreatePeerConnectionHandler(
248 WebKit::WebPeerConnectionHandlerClient* client); 260 WebKit::WebPeerConnectionHandlerClient* client);
249 WebKit::WebPeerConnection00Handler* CreatePeerConnectionHandlerJsep( 261 WebKit::WebPeerConnection00Handler* CreatePeerConnectionHandlerJsep(
250 WebKit::WebPeerConnection00HandlerClient* client); 262 WebKit::WebPeerConnection00HandlerClient* client);
251 263
252 // Functions to add and remove observers for this object. 264 // Functions to add and remove observers for this object.
253 void AddObserver(content::RenderViewObserver* observer); 265 void AddObserver(content::RenderViewObserver* observer);
254 void RemoveObserver(content::RenderViewObserver* observer); 266 void RemoveObserver(content::RenderViewObserver* observer);
255 267
256 // Adds the given file chooser request to the file_chooser_completion_ queue 268 // Adds the given file chooser request to the file_chooser_completion_ queue
(...skipping 1101 matching lines...) Expand 10 before | Expand all | Expand 10 after
1358 // is fine. 1370 // is fine.
1359 ObserverList<content::RenderViewObserver> observers_; 1371 ObserverList<content::RenderViewObserver> observers_;
1360 1372
1361 // Used to inform didChangeSelection() when it is called in the context 1373 // Used to inform didChangeSelection() when it is called in the context
1362 // of handling a ViewMsg_SelectRange IPC. 1374 // of handling a ViewMsg_SelectRange IPC.
1363 bool handling_select_range_; 1375 bool handling_select_range_;
1364 1376
1365 // Wraps the |webwidget_| as a MouseLockDispatcher::LockTarget interface. 1377 // Wraps the |webwidget_| as a MouseLockDispatcher::LockTarget interface.
1366 scoped_ptr<MouseLockDispatcher::LockTarget> webwidget_mouse_lock_target_; 1378 scoped_ptr<MouseLockDispatcher::LockTarget> webwidget_mouse_lock_target_;
1367 1379
1380 #if defined(OS_ANDROID)
1381 // The media player manager for managing all the media players on this view.
1382 scoped_ptr<webkit_media::WebMediaPlayerManagerAndroid> media_player_manager_;
1383 #endif
1384
1368 // Plugins ------------------------------------------------------------------- 1385 // Plugins -------------------------------------------------------------------
1369 1386
1370 // All the currently active plugin delegates for this RenderView; kept so 1387 // All the currently active plugin delegates for this RenderView; kept so
1371 // that we can enumerate them to send updates about things like window 1388 // that we can enumerate them to send updates about things like window
1372 // location or tab focus and visibily. These are non-owning references. 1389 // location or tab focus and visibily. These are non-owning references.
1373 std::set<WebPluginDelegateProxy*> plugin_delegates_; 1390 std::set<WebPluginDelegateProxy*> plugin_delegates_;
1374 1391
1375 #if defined(OS_WIN) 1392 #if defined(OS_WIN)
1376 // The ID of the focused NPAPI plug-in. 1393 // The ID of the focused NPAPI plug-in.
1377 int focused_plugin_id_; 1394 int focused_plugin_id_;
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
1411 // bunch of stuff, you should probably create a helper class and put your 1428 // bunch of stuff, you should probably create a helper class and put your
1412 // data and methods on that to avoid bloating RenderView more. You can 1429 // data and methods on that to avoid bloating RenderView more. You can
1413 // use the Observer interface to filter IPC messages and receive frame change 1430 // use the Observer interface to filter IPC messages and receive frame change
1414 // notifications. 1431 // notifications.
1415 // --------------------------------------------------------------------------- 1432 // ---------------------------------------------------------------------------
1416 1433
1417 DISALLOW_COPY_AND_ASSIGN(RenderViewImpl); 1434 DISALLOW_COPY_AND_ASSIGN(RenderViewImpl);
1418 }; 1435 };
1419 1436
1420 #endif // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ 1437 #endif // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | content/renderer/render_view_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698