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

Side by Side Diff: content/renderer/render_view_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
« no previous file with comments | « content/content_browser.gypi ('k') | 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 7
8 #include <deque> 8 #include <deque>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 90
91 } // namespace webkit 91 } // namespace webkit
92 92
93 namespace webkit_glue { 93 namespace webkit_glue {
94 class ImageResourceFetcher; 94 class ImageResourceFetcher;
95 class ResourceFetcher; 95 class ResourceFetcher;
96 } 96 }
97 97
98 #if defined(OS_ANDROID) 98 #if defined(OS_ANDROID)
99 namespace webkit_media { 99 namespace webkit_media {
100 class MediaPlayerBridgeManagerImpl;
101 class WebMediaPlayerManagerAndroid; 100 class WebMediaPlayerManagerAndroid;
102 } 101 }
103 #endif 102 #endif
104 103
105 namespace WebKit { 104 namespace WebKit {
106 class WebApplicationCacheHost; 105 class WebApplicationCacheHost;
107 class WebApplicationCacheHostClient; 106 class WebApplicationCacheHostClient;
108 class WebDOMMessageEvent; 107 class WebDOMMessageEvent;
109 class WebDataSource; 108 class WebDataSource;
110 class WebDateTimeChooserCompletion; 109 class WebDateTimeChooserCompletion;
(...skipping 1314 matching lines...) Expand 10 before | Expand all | Expand 10 after
1425 typedef std::vector< linked_ptr<ContentDetector> > ContentDetectorList; 1424 typedef std::vector< linked_ptr<ContentDetector> > ContentDetectorList;
1426 ContentDetectorList content_detectors_; 1425 ContentDetectorList content_detectors_;
1427 1426
1428 // Proxy class for WebMediaPlayer to communicate with the real media player 1427 // Proxy class for WebMediaPlayer to communicate with the real media player
1429 // objects in browser process. 1428 // objects in browser process.
1430 WebMediaPlayerProxyImplAndroid* media_player_proxy_; 1429 WebMediaPlayerProxyImplAndroid* media_player_proxy_;
1431 1430
1432 // The media player manager for managing all the media players on this view. 1431 // The media player manager for managing all the media players on this view.
1433 scoped_ptr<webkit_media::WebMediaPlayerManagerAndroid> media_player_manager_; 1432 scoped_ptr<webkit_media::WebMediaPlayerManagerAndroid> media_player_manager_;
1434 1433
1435 // Resource manager for all the android media player objects if they are
1436 // created in the renderer process.
1437 scoped_ptr<webkit_media::MediaPlayerBridgeManagerImpl> media_bridge_manager_;
1438
1439 // A date/time picker object for date and time related input elements. 1434 // A date/time picker object for date and time related input elements.
1440 scoped_ptr<RendererDateTimePicker> date_time_picker_client_; 1435 scoped_ptr<RendererDateTimePicker> date_time_picker_client_;
1441 #endif 1436 #endif
1442 1437
1443 // Plugins ------------------------------------------------------------------- 1438 // Plugins -------------------------------------------------------------------
1444 1439
1445 // All the currently active plugin delegates for this RenderView; kept so 1440 // All the currently active plugin delegates for this RenderView; kept so
1446 // that we can enumerate them to send updates about things like window 1441 // that we can enumerate them to send updates about things like window
1447 // location or tab focus and visibily. These are non-owning references. 1442 // location or tab focus and visibily. These are non-owning references.
1448 std::set<WebPluginDelegateProxy*> plugin_delegates_; 1443 std::set<WebPluginDelegateProxy*> plugin_delegates_;
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
1535 // use the Observer interface to filter IPC messages and receive frame change 1530 // use the Observer interface to filter IPC messages and receive frame change
1536 // notifications. 1531 // notifications.
1537 // --------------------------------------------------------------------------- 1532 // ---------------------------------------------------------------------------
1538 1533
1539 DISALLOW_COPY_AND_ASSIGN(RenderViewImpl); 1534 DISALLOW_COPY_AND_ASSIGN(RenderViewImpl);
1540 }; 1535 };
1541 1536
1542 } // namespace content 1537 } // namespace content
1543 1538
1544 #endif // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ 1539 #endif // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
OLDNEW
« no previous file with comments | « content/content_browser.gypi ('k') | content/renderer/render_view_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698