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

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

Issue 278353003: Make RendererMediaPlayerManager a RenderFrameObserver. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 #include "content/renderer/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 763 matching lines...) Expand 10 before | Expand all | Expand 10 after
774 #if defined(ENABLE_WEBRTC) 774 #if defined(ENABLE_WEBRTC)
775 if (!media_stream_dispatcher_) 775 if (!media_stream_dispatcher_)
776 media_stream_dispatcher_ = new MediaStreamDispatcher(this); 776 media_stream_dispatcher_ = new MediaStreamDispatcher(this);
777 #endif 777 #endif
778 778
779 new MHTMLGenerator(this); 779 new MHTMLGenerator(this);
780 #if defined(OS_MACOSX) 780 #if defined(OS_MACOSX)
781 new TextInputClientObserver(this); 781 new TextInputClientObserver(this);
782 #endif // defined(OS_MACOSX) 782 #endif // defined(OS_MACOSX)
783 783
784 #if defined(OS_ANDROID)
785 media_player_manager_ = new RendererMediaPlayerManager(this);
jam 2014/05/20 00:34:49 remove the other references to media_player_manage
xhwang 2014/05/22 19:06:00 Done.
786 #endif
787
788 // The next group of objects all implement RenderViewObserver, so are deleted 784 // The next group of objects all implement RenderViewObserver, so are deleted
789 // along with the RenderView automatically. 785 // along with the RenderView automatically.
790 devtools_agent_ = new DevToolsAgent(this); 786 devtools_agent_ = new DevToolsAgent(this);
791 if (RenderWidgetCompositor* rwc = compositor()) { 787 if (RenderWidgetCompositor* rwc = compositor()) {
792 webview()->devToolsAgent()->setLayerTreeId(rwc->GetLayerTreeId()); 788 webview()->devToolsAgent()->setLayerTreeId(rwc->GetLayerTreeId());
793 } 789 }
794 mouse_lock_dispatcher_ = new RenderViewMouseLockDispatcher(this); 790 mouse_lock_dispatcher_ = new RenderViewMouseLockDispatcher(this);
795 791
796 history_controller_.reset(new HistoryController(this)); 792 history_controller_.reset(new HistoryController(this));
797 793
(...skipping 3341 matching lines...) Expand 10 before | Expand all | Expand 10 after
4139 std::vector<gfx::Size> sizes; 4135 std::vector<gfx::Size> sizes;
4140 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); 4136 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
4141 if (!url.isEmpty()) 4137 if (!url.isEmpty())
4142 urls.push_back( 4138 urls.push_back(
4143 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); 4139 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
4144 } 4140 }
4145 SendUpdateFaviconURL(urls); 4141 SendUpdateFaviconURL(urls);
4146 } 4142 }
4147 4143
4148 } // namespace content 4144 } // namespace content
OLDNEW
« content/browser/web_contents/web_contents_impl.cc ('K') | « content/renderer/render_frame_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698