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

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: use WeakBindingSet rebase 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 2391 matching lines...) Expand 10 before | Expand all | Expand 10 after
2402 result = policy->AddRule(sandbox::TargetPolicy::SUBSYS_HANDLES, 2402 result = policy->AddRule(sandbox::TargetPolicy::SUBSYS_HANDLES,
2403 sandbox::TargetPolicy::HANDLES_DUP_ANY, 2403 sandbox::TargetPolicy::HANDLES_DUP_ANY,
2404 L"File"); 2404 L"File");
2405 if (result != sandbox::SBOX_ALL_OK) { 2405 if (result != sandbox::SBOX_ALL_OK) {
2406 *success = false; 2406 *success = false;
2407 return; 2407 return;
2408 } 2408 }
2409 } 2409 }
2410 #endif 2410 #endif
2411 2411
2412 void ChromeContentBrowserClient::OverrideRenderFrameMojoServices( 2412 void ChromeContentBrowserClient::OverrideFrameMojoShellServices(
2413 content::ServiceRegistry* registry, 2413 content::ServiceRegistry* registry,
2414 content::RenderFrameHost* render_frame_host) { 2414 content::RenderFrameHost* render_frame_host) {
2415 #if defined(OS_CHROMEOS) 2415 #if defined(OS_CHROMEOS)
2416 registry->AddService( 2416 registry->AddService(
2417 base::Bind(&chromeos::attestation::PlatformVerificationImpl::Create, 2417 base::Bind(&chromeos::attestation::PlatformVerificationImpl::Create,
2418 render_frame_host)); 2418 render_frame_host));
2419 #endif 2419 #endif
2420 } 2420 }
2421 2421
2422 void ChromeContentBrowserClient::RegisterMojoApplications( 2422 void ChromeContentBrowserClient::RegisterMojoApplications(
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
2544 switches::kDisableWebRtcEncryption, 2544 switches::kDisableWebRtcEncryption,
2545 }; 2545 };
2546 to_command_line->CopySwitchesFrom(from_command_line, 2546 to_command_line->CopySwitchesFrom(from_command_line,
2547 kWebRtcDevSwitchNames, 2547 kWebRtcDevSwitchNames,
2548 arraysize(kWebRtcDevSwitchNames)); 2548 arraysize(kWebRtcDevSwitchNames));
2549 } 2549 }
2550 } 2550 }
2551 #endif // defined(ENABLE_WEBRTC) 2551 #endif // defined(ENABLE_WEBRTC)
2552 2552
2553 } // namespace chrome 2553 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698