| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_frame_impl.h" | 5 #include "content/renderer/render_frame_impl.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 4661 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4672 selection_range_ = range; | 4672 selection_range_ = range; |
| 4673 SetSelectedText(text, offset, range); | 4673 SetSelectedText(text, offset, range); |
| 4674 } | 4674 } |
| 4675 GetRenderWidget()->UpdateSelectionBounds(); | 4675 GetRenderWidget()->UpdateSelectionBounds(); |
| 4676 } | 4676 } |
| 4677 | 4677 |
| 4678 void RenderFrameImpl::InitializeUserMediaClient() { | 4678 void RenderFrameImpl::InitializeUserMediaClient() { |
| 4679 if (!RenderThreadImpl::current()) // Will be NULL during unit tests. | 4679 if (!RenderThreadImpl::current()) // Will be NULL during unit tests. |
| 4680 return; | 4680 return; |
| 4681 | 4681 |
| 4682 #if defined(OS_ANDROID) | |
| 4683 if (base::CommandLine::ForCurrentProcess()->HasSwitch( | |
| 4684 switches::kDisableWebRTC)) | |
| 4685 return; | |
| 4686 #endif | |
| 4687 | |
| 4688 #if defined(ENABLE_WEBRTC) | 4682 #if defined(ENABLE_WEBRTC) |
| 4689 DCHECK(!web_user_media_client_); | 4683 DCHECK(!web_user_media_client_); |
| 4690 web_user_media_client_ = new UserMediaClientImpl( | 4684 web_user_media_client_ = new UserMediaClientImpl( |
| 4691 this, | 4685 this, |
| 4692 RenderThreadImpl::current()->GetPeerConnectionDependencyFactory(), | 4686 RenderThreadImpl::current()->GetPeerConnectionDependencyFactory(), |
| 4693 make_scoped_ptr(new MediaStreamDispatcher(this)).Pass()); | 4687 make_scoped_ptr(new MediaStreamDispatcher(this)).Pass()); |
| 4694 #endif | 4688 #endif |
| 4695 } | 4689 } |
| 4696 | 4690 |
| 4697 WebMediaPlayer* RenderFrameImpl::CreateWebMediaPlayerForMediaStream( | 4691 WebMediaPlayer* RenderFrameImpl::CreateWebMediaPlayerForMediaStream( |
| (...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5069 void RenderFrameImpl::RegisterMojoServices() { | 5063 void RenderFrameImpl::RegisterMojoServices() { |
| 5070 // Only main frame have ImageDownloader service. | 5064 // Only main frame have ImageDownloader service. |
| 5071 if (!frame_->parent()) { | 5065 if (!frame_->parent()) { |
| 5072 GetServiceRegistry()->AddService<image_downloader::ImageDownloader>( | 5066 GetServiceRegistry()->AddService<image_downloader::ImageDownloader>( |
| 5073 base::Bind(&ImageDownloaderImpl::CreateMojoService, | 5067 base::Bind(&ImageDownloaderImpl::CreateMojoService, |
| 5074 base::Unretained(this))); | 5068 base::Unretained(this))); |
| 5075 } | 5069 } |
| 5076 } | 5070 } |
| 5077 | 5071 |
| 5078 } // namespace content | 5072 } // namespace content |
| OLD | NEW |