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

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: 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
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 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 89
90 } // namespace webkit 90 } // namespace webkit
91 91
92 namespace webkit_glue { 92 namespace webkit_glue {
93 class ImageResourceFetcher; 93 class ImageResourceFetcher;
94 class ResourceFetcher; 94 class ResourceFetcher;
95 } 95 }
96 96
97 #if defined(OS_ANDROID) 97 #if defined(OS_ANDROID)
98 namespace webkit_media { 98 namespace webkit_media {
99 class MediaPlayerBridgeManagerImpl;
100 class WebMediaPlayerManagerAndroid; 99 class WebMediaPlayerManagerAndroid;
101 } 100 }
102 #endif 101 #endif
103 102
104 namespace WebKit { 103 namespace WebKit {
105 class WebApplicationCacheHost; 104 class WebApplicationCacheHost;
106 class WebApplicationCacheHostClient; 105 class WebApplicationCacheHostClient;
107 class WebDOMMessageEvent; 106 class WebDOMMessageEvent;
108 class WebDataSource; 107 class WebDataSource;
109 class WebDateTimeChooserCompletion; 108 class WebDateTimeChooserCompletion;
(...skipping 1306 matching lines...) Expand 10 before | Expand all | Expand 10 after
1416 typedef std::vector< linked_ptr<ContentDetector> > ContentDetectorList; 1415 typedef std::vector< linked_ptr<ContentDetector> > ContentDetectorList;
1417 ContentDetectorList content_detectors_; 1416 ContentDetectorList content_detectors_;
1418 1417
1419 // Proxy class for WebMediaPlayer to communicate with the real media player 1418 // Proxy class for WebMediaPlayer to communicate with the real media player
1420 // objects in browser process. 1419 // objects in browser process.
1421 WebMediaPlayerProxyImplAndroid* media_player_proxy_; 1420 WebMediaPlayerProxyImplAndroid* media_player_proxy_;
1422 1421
1423 // The media player manager for managing all the media players on this view. 1422 // The media player manager for managing all the media players on this view.
1424 scoped_ptr<webkit_media::WebMediaPlayerManagerAndroid> media_player_manager_; 1423 scoped_ptr<webkit_media::WebMediaPlayerManagerAndroid> media_player_manager_;
1425 1424
1426 // Resource manager for all the android media player objects if they are
1427 // created in the renderer process.
1428 scoped_ptr<webkit_media::MediaPlayerBridgeManagerImpl> media_bridge_manager_;
1429
1430 // A date/time picker object for date and time related input elements. 1425 // A date/time picker object for date and time related input elements.
1431 scoped_ptr<RendererDateTimePicker> date_time_picker_client_; 1426 scoped_ptr<RendererDateTimePicker> date_time_picker_client_;
1432 #endif 1427 #endif
1433 1428
1434 // Plugins ------------------------------------------------------------------- 1429 // Plugins -------------------------------------------------------------------
1435 1430
1436 // All the currently active plugin delegates for this RenderView; kept so 1431 // All the currently active plugin delegates for this RenderView; kept so
1437 // that we can enumerate them to send updates about things like window 1432 // that we can enumerate them to send updates about things like window
1438 // location or tab focus and visibily. These are non-owning references. 1433 // location or tab focus and visibily. These are non-owning references.
1439 std::set<WebPluginDelegateProxy*> plugin_delegates_; 1434 std::set<WebPluginDelegateProxy*> plugin_delegates_;
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
1526 // use the Observer interface to filter IPC messages and receive frame change 1521 // use the Observer interface to filter IPC messages and receive frame change
1527 // notifications. 1522 // notifications.
1528 // --------------------------------------------------------------------------- 1523 // ---------------------------------------------------------------------------
1529 1524
1530 DISALLOW_COPY_AND_ASSIGN(RenderViewImpl); 1525 DISALLOW_COPY_AND_ASSIGN(RenderViewImpl);
1531 }; 1526 };
1532 1527
1533 } // namespace content 1528 } // namespace content
1534 1529
1535 #endif // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ 1530 #endif // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698