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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 1209283003: FrameMojoShell provides services to mojo apps. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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
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 "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 2390 matching lines...) Expand 10 before | Expand all | Expand 10 after
2401 result = policy->AddRule(sandbox::TargetPolicy::SUBSYS_HANDLES, 2401 result = policy->AddRule(sandbox::TargetPolicy::SUBSYS_HANDLES,
2402 sandbox::TargetPolicy::HANDLES_DUP_ANY, 2402 sandbox::TargetPolicy::HANDLES_DUP_ANY,
2403 L"File"); 2403 L"File");
2404 if (result != sandbox::SBOX_ALL_OK) { 2404 if (result != sandbox::SBOX_ALL_OK) {
2405 *success = false; 2405 *success = false;
2406 return; 2406 return;
2407 } 2407 }
2408 } 2408 }
2409 #endif 2409 #endif
2410 2410
2411 void ChromeContentBrowserClient::OverrideRenderFrameMojoServices( 2411 void ChromeContentBrowserClient::OverrideFrameMojoShellServices(
2412 content::ServiceRegistry* registry, 2412 content::ServiceRegistry* registry,
2413 content::RenderFrameHost* render_frame_host) { 2413 content::RenderFrameHost* render_frame_host) {
2414 #if defined(OS_CHROMEOS) 2414 #if defined(OS_CHROMEOS)
2415 registry->AddService( 2415 registry->AddService(
2416 base::Bind(&chromeos::attestation::PlatformVerificationImpl::Create, 2416 base::Bind(&chromeos::attestation::PlatformVerificationImpl::Create,
2417 render_frame_host)); 2417 render_frame_host));
2418 #endif 2418 #endif
2419 } 2419 }
2420 2420
2421 void ChromeContentBrowserClient::RegisterMojoApplications( 2421 void ChromeContentBrowserClient::RegisterMojoApplications(
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
2543 switches::kDisableWebRtcEncryption, 2543 switches::kDisableWebRtcEncryption,
2544 }; 2544 };
2545 to_command_line->CopySwitchesFrom(from_command_line, 2545 to_command_line->CopySwitchesFrom(from_command_line,
2546 kWebRtcDevSwitchNames, 2546 kWebRtcDevSwitchNames,
2547 arraysize(kWebRtcDevSwitchNames)); 2547 arraysize(kWebRtcDevSwitchNames));
2548 } 2548 }
2549 } 2549 }
2550 #endif // defined(ENABLE_WEBRTC) 2550 #endif // defined(ENABLE_WEBRTC)
2551 2551
2552 } // namespace chrome 2552 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698