| OLD | NEW |
| 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/shell/renderer/shell_content_renderer_client.h" | 5 #include "content/shell/renderer/shell_content_renderer_client.h" |
| 6 | 6 |
| 7 #include "base/callback.h" | 7 #include "base/callback.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/debug/debugger.h" | 9 #include "base/debug/debugger.h" |
| 10 #include "content/public/common/content_constants.h" | 10 #include "content/public/common/content_constants.h" |
| (...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 139 return NULL; | 139 return NULL; |
| 140 #if defined(ENABLE_WEBRTC) | 140 #if defined(ENABLE_WEBRTC) |
| 141 WebTestInterfaces* interfaces = | 141 WebTestInterfaces* interfaces = |
| 142 ShellRenderProcessObserver::GetInstance()->test_interfaces(); | 142 ShellRenderProcessObserver::GetInstance()->test_interfaces(); |
| 143 return interfaces->createWebRTCPeerConnectionHandler(client); | 143 return interfaces->createWebRTCPeerConnectionHandler(client); |
| 144 #else | 144 #else |
| 145 return NULL; | 145 return NULL; |
| 146 #endif | 146 #endif |
| 147 } | 147 } |
| 148 | 148 |
| 149 webkit_media::MediaStreamClient* | 149 MediaStreamClient* |
| 150 ShellContentRendererClient::OverrideCreateMediaStreamClient() { | 150 ShellContentRendererClient::OverrideCreateMediaStreamClient() { |
| 151 if (!shell_media_stream_client_) | 151 if (!shell_media_stream_client_) |
| 152 shell_media_stream_client_.reset(new ShellMediaStreamClient()); | 152 shell_media_stream_client_.reset(new ShellMediaStreamClient()); |
| 153 return shell_media_stream_client_.get(); | 153 return shell_media_stream_client_.get(); |
| 154 } | 154 } |
| 155 | 155 |
| 156 WebMIDIAccessor* | 156 WebMIDIAccessor* |
| 157 ShellContentRendererClient::OverrideCreateMIDIAccessor( | 157 ShellContentRendererClient::OverrideCreateMIDIAccessor( |
| 158 WebMIDIAccessorClient* client) { | 158 WebMIDIAccessorClient* client) { |
| 159 WebTestInterfaces* interfaces = | 159 WebTestInterfaces* interfaces = |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 202 if (CommandLine::ForCurrentProcess()->HasSwitch( | 202 if (CommandLine::ForCurrentProcess()->HasSwitch( |
| 203 switches::kEnableBrowserPluginForAllViewTypes)) { | 203 switches::kEnableBrowserPluginForAllViewTypes)) { |
| 204 // Allow BrowserPlugin if forced by command line flag. This is generally | 204 // Allow BrowserPlugin if forced by command line flag. This is generally |
| 205 // true for tests. | 205 // true for tests. |
| 206 return true; | 206 return true; |
| 207 } | 207 } |
| 208 return ContentRendererClient::AllowBrowserPlugin(container); | 208 return ContentRendererClient::AllowBrowserPlugin(container); |
| 209 } | 209 } |
| 210 | 210 |
| 211 } // namespace content | 211 } // namespace content |
| OLD | NEW |