| 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/browser/chrome_content_browser_client.h" | 5 #include "chrome/browser/chrome_content_browser_client.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <set> | 8 #include <set> |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 2393 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2404 result = policy->AddRule(sandbox::TargetPolicy::SUBSYS_HANDLES, | 2404 result = policy->AddRule(sandbox::TargetPolicy::SUBSYS_HANDLES, |
| 2405 sandbox::TargetPolicy::HANDLES_DUP_ANY, | 2405 sandbox::TargetPolicy::HANDLES_DUP_ANY, |
| 2406 L"File"); | 2406 L"File"); |
| 2407 if (result != sandbox::SBOX_ALL_OK) { | 2407 if (result != sandbox::SBOX_ALL_OK) { |
| 2408 *success = false; | 2408 *success = false; |
| 2409 return; | 2409 return; |
| 2410 } | 2410 } |
| 2411 } | 2411 } |
| 2412 #endif | 2412 #endif |
| 2413 | 2413 |
| 2414 void ChromeContentBrowserClient::OverrideRenderFrameMojoServices( | 2414 void ChromeContentBrowserClient::OverrideFrameMojoShellServices( |
| 2415 content::ServiceRegistry* registry, | 2415 content::ServiceRegistry* registry, |
| 2416 content::RenderFrameHost* render_frame_host) { | 2416 content::RenderFrameHost* render_frame_host) { |
| 2417 #if defined(OS_CHROMEOS) | 2417 #if defined(OS_CHROMEOS) |
| 2418 registry->AddService( | 2418 registry->AddService( |
| 2419 base::Bind(&chromeos::attestation::PlatformVerificationImpl::Create, | 2419 base::Bind(&chromeos::attestation::PlatformVerificationImpl::Create, |
| 2420 render_frame_host)); | 2420 render_frame_host)); |
| 2421 #endif | 2421 #endif |
| 2422 } | 2422 } |
| 2423 | 2423 |
| 2424 void ChromeContentBrowserClient::RegisterMojoApplications( | 2424 void ChromeContentBrowserClient::RegisterMojoApplications( |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2546 switches::kDisableWebRtcEncryption, | 2546 switches::kDisableWebRtcEncryption, |
| 2547 }; | 2547 }; |
| 2548 to_command_line->CopySwitchesFrom(from_command_line, | 2548 to_command_line->CopySwitchesFrom(from_command_line, |
| 2549 kWebRtcDevSwitchNames, | 2549 kWebRtcDevSwitchNames, |
| 2550 arraysize(kWebRtcDevSwitchNames)); | 2550 arraysize(kWebRtcDevSwitchNames)); |
| 2551 } | 2551 } |
| 2552 } | 2552 } |
| 2553 #endif // defined(ENABLE_WEBRTC) | 2553 #endif // defined(ENABLE_WEBRTC) |
| 2554 | 2554 |
| 2555 } // namespace chrome | 2555 } // namespace chrome |
| OLD | NEW |