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

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

Issue 9309078: Adding a skeleton MediaStreamCenter. (Closed)
Patch Set: Review comments fixed Created 8 years, 10 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
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 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 583 matching lines...) Expand 10 before | Expand all | Expand 10 after
594 594
595 WebKit::WebPeerConnectionHandler* RenderViewImpl::CreatePeerConnectionHandler( 595 WebKit::WebPeerConnectionHandler* RenderViewImpl::CreatePeerConnectionHandler(
596 WebKit::WebPeerConnectionHandlerClient* client) { 596 WebKit::WebPeerConnectionHandlerClient* client) {
597 const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); 597 const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
598 if (!cmd_line->HasSwitch(switches::kEnableMediaStream)) 598 if (!cmd_line->HasSwitch(switches::kEnableMediaStream))
599 return NULL; 599 return NULL;
600 EnsureMediaStreamImpl(); 600 EnsureMediaStreamImpl();
601 return media_stream_impl_->CreatePeerConnectionHandler(client); 601 return media_stream_impl_->CreatePeerConnectionHandler(client);
602 } 602 }
603 603
604 WebKit::WebMediaStreamCenter* RenderViewImpl::CreateMediaStreamCenter(
darin (slow to review) 2012/02/13 16:27:01 In this file, please add using directives at the t
tommyw 2012/02/13 17:30:07 Done.
605 WebKit::WebMediaStreamCenterClient* client) {
606 const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
607 if (!cmd_line->HasSwitch(switches::kEnableMediaStream))
608 return NULL;
609 EnsureMediaStreamImpl();
610 return media_stream_impl_->CreateMediaStreamCenter(client);
611 }
612
604 void RenderViewImpl::AddObserver(RenderViewObserver* observer) { 613 void RenderViewImpl::AddObserver(RenderViewObserver* observer) {
605 observers_.AddObserver(observer); 614 observers_.AddObserver(observer);
606 } 615 }
607 616
608 void RenderViewImpl::RemoveObserver(RenderViewObserver* observer) { 617 void RenderViewImpl::RemoveObserver(RenderViewObserver* observer) {
609 observer->RenderViewGone(); 618 observer->RenderViewGone();
610 observers_.RemoveObserver(observer); 619 observers_.RemoveObserver(observer);
611 } 620 }
612 621
613 WebKit::WebView* RenderViewImpl::webview() const { 622 WebKit::WebView* RenderViewImpl::webview() const {
(...skipping 4378 matching lines...) Expand 10 before | Expand all | Expand 10 after
4992 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { 5001 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const {
4993 return !!RenderThreadImpl::current()->compositor_thread(); 5002 return !!RenderThreadImpl::current()->compositor_thread();
4994 } 5003 }
4995 5004
4996 void RenderViewImpl::OnJavaBridgeInit() { 5005 void RenderViewImpl::OnJavaBridgeInit() {
4997 DCHECK(!java_bridge_dispatcher_.get()); 5006 DCHECK(!java_bridge_dispatcher_.get());
4998 #if defined(ENABLE_JAVA_BRIDGE) 5007 #if defined(ENABLE_JAVA_BRIDGE)
4999 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this)); 5008 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this));
5000 #endif 5009 #endif
5001 } 5010 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698