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

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

Issue 1308863002: [Eraser strings] Remove flag to disable WebRTC on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Include generated_resources.grd Created 5 years, 4 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
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | no next file » | 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 #include "content/renderer/render_thread_impl.h" 5 #include "content/renderer/render_thread_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <map> 9 #include <map>
10 #include <vector> 10 #include <vector>
(...skipping 1681 matching lines...) Expand 10 before | Expand all | Expand 10 after
1692 GpuChannelHost::Create(this, 1692 GpuChannelHost::Create(this,
1693 gpu_info, 1693 gpu_info,
1694 channel_handle, 1694 channel_handle,
1695 ChildProcess::current()->GetShutDownEvent(), 1695 ChildProcess::current()->GetShutDownEvent(),
1696 gpu_memory_buffer_manager()); 1696 gpu_memory_buffer_manager());
1697 return gpu_channel_.get(); 1697 return gpu_channel_.get();
1698 } 1698 }
1699 1699
1700 blink::WebMediaStreamCenter* RenderThreadImpl::CreateMediaStreamCenter( 1700 blink::WebMediaStreamCenter* RenderThreadImpl::CreateMediaStreamCenter(
1701 blink::WebMediaStreamCenterClient* client) { 1701 blink::WebMediaStreamCenterClient* client) {
1702 #if defined(OS_ANDROID)
1703 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
1704 switches::kDisableWebRTC))
1705 return NULL;
1706 #endif
1707
1708 #if defined(ENABLE_WEBRTC) 1702 #if defined(ENABLE_WEBRTC)
1709 if (!media_stream_center_) { 1703 if (!media_stream_center_) {
1710 media_stream_center_ = GetContentClient()->renderer() 1704 media_stream_center_ = GetContentClient()->renderer()
1711 ->OverrideCreateWebMediaStreamCenter(client); 1705 ->OverrideCreateWebMediaStreamCenter(client);
1712 if (!media_stream_center_) { 1706 if (!media_stream_center_) {
1713 scoped_ptr<MediaStreamCenter> media_stream_center( 1707 scoped_ptr<MediaStreamCenter> media_stream_center(
1714 new MediaStreamCenter(client, GetPeerConnectionDependencyFactory())); 1708 new MediaStreamCenter(client, GetPeerConnectionDependencyFactory()));
1715 media_stream_center_ = media_stream_center.release(); 1709 media_stream_center_ = media_stream_center.release();
1716 } 1710 }
1717 } 1711 }
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
1957 } 1951 }
1958 1952
1959 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() { 1953 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() {
1960 size_t erased = 1954 size_t erased =
1961 RenderThreadImpl::current()->pending_render_frame_connects_.erase( 1955 RenderThreadImpl::current()->pending_render_frame_connects_.erase(
1962 routing_id_); 1956 routing_id_);
1963 DCHECK_EQ(1u, erased); 1957 DCHECK_EQ(1u, erased);
1964 } 1958 }
1965 1959
1966 } // namespace content 1960 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698