| 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 "chrome/renderer/chrome_content_renderer_client.h" | 5 #include "chrome/renderer/chrome_content_renderer_client.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 1225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1236 if (base::CommandLine::ForCurrentProcess()->HasSwitch( | 1236 if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
| 1237 switches::kEnablePepperTesting)) { | 1237 switches::kEnablePepperTesting)) { |
| 1238 return true; | 1238 return true; |
| 1239 } | 1239 } |
| 1240 #endif // !defined(OS_ANDROID) | 1240 #endif // !defined(OS_ANDROID) |
| 1241 return false; | 1241 return false; |
| 1242 } | 1242 } |
| 1243 | 1243 |
| 1244 void ChromeContentRendererClient::AddKeySystems( | 1244 void ChromeContentRendererClient::AddKeySystems( |
| 1245 std::vector<media::KeySystemInfo>* key_systems) { | 1245 std::vector<media::KeySystemInfo>* key_systems) { |
| 1246 AddChromeKeySystemsInfo(key_systems); |
| 1247 } |
| 1248 |
| 1249 void ChromeContentRendererClient::AddSupportedKeySystems( |
| 1250 std::vector<std::unique_ptr<::media::KeySystemProperties>>* key_systems) { |
| 1246 AddChromeKeySystems(key_systems); | 1251 AddChromeKeySystems(key_systems); |
| 1247 } | 1252 } |
| 1248 | 1253 |
| 1249 bool ChromeContentRendererClient::ShouldReportDetailedMessageForSource( | 1254 bool ChromeContentRendererClient::ShouldReportDetailedMessageForSource( |
| 1250 const base::string16& source) const { | 1255 const base::string16& source) const { |
| 1251 #if defined(ENABLE_EXTENSIONS) | 1256 #if defined(ENABLE_EXTENSIONS) |
| 1252 return extensions::IsSourceFromAnExtension(source); | 1257 return extensions::IsSourceFromAnExtension(source); |
| 1253 #else | 1258 #else |
| 1254 return false; | 1259 return false; |
| 1255 #endif | 1260 #endif |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1410 // chrome.system.network.getNetworkInterfaces provides the same | 1415 // chrome.system.network.getNetworkInterfaces provides the same |
| 1411 // information. Also, the enforcement of sending and binding UDP is already done | 1416 // information. Also, the enforcement of sending and binding UDP is already done |
| 1412 // by chrome extension permission model. | 1417 // by chrome extension permission model. |
| 1413 bool ChromeContentRendererClient::ShouldEnforceWebRTCRoutingPreferences() { | 1418 bool ChromeContentRendererClient::ShouldEnforceWebRTCRoutingPreferences() { |
| 1414 #if defined(ENABLE_EXTENSIONS) | 1419 #if defined(ENABLE_EXTENSIONS) |
| 1415 return !IsStandaloneExtensionProcess(); | 1420 return !IsStandaloneExtensionProcess(); |
| 1416 #else | 1421 #else |
| 1417 return true; | 1422 return true; |
| 1418 #endif | 1423 #endif |
| 1419 } | 1424 } |
| OLD | NEW |