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

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

Issue 1566603003: Dummy patch to try out Mojo connection (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Initialize from RegisterRenderProcessMojoServices Created 4 years, 11 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
« no previous file with comments | « chrome/browser/chrome_content_browser_client.h ('k') | chrome/chrome_renderer.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 #endif 284 #endif
285 285
286 #if !defined(OS_ANDROID) && !defined(OS_IOS) 286 #if !defined(OS_ANDROID) && !defined(OS_IOS)
287 #include "components/webusb/public/interfaces/webusb_permission_bubble.mojom.h" 287 #include "components/webusb/public/interfaces/webusb_permission_bubble.mojom.h"
288 #endif 288 #endif
289 289
290 #if defined(ENABLE_WAYLAND_SERVER) 290 #if defined(ENABLE_WAYLAND_SERVER)
291 #include "chrome/browser/chrome_browser_main_extra_parts_exo.h" 291 #include "chrome/browser/chrome_browser_main_extra_parts_exo.h"
292 #endif 292 #endif
293 293
294 #include "components/metrics/leak_detector/leak_detector_monitor_impl.h"
295
294 using base::FileDescriptor; 296 using base::FileDescriptor;
295 using blink::WebWindowFeatures; 297 using blink::WebWindowFeatures;
296 using content::AccessTokenStore; 298 using content::AccessTokenStore;
297 using content::BrowserThread; 299 using content::BrowserThread;
298 using content::BrowserURLHandler; 300 using content::BrowserURLHandler;
299 using content::ChildProcessSecurityPolicy; 301 using content::ChildProcessSecurityPolicy;
300 using content::QuotaPermissionContext; 302 using content::QuotaPermissionContext;
301 using content::RenderFrameHost; 303 using content::RenderFrameHost;
302 using content::RenderViewHost; 304 using content::RenderViewHost;
303 using content::ResourceType; 305 using content::ResourceType;
(...skipping 2313 matching lines...) Expand 10 before | Expand all | Expand 10 after
2617 2619
2618 // Renderers need to send named pipe handles and shared memory 2620 // Renderers need to send named pipe handles and shared memory
2619 // segment handles to NaCl loader processes. 2621 // segment handles to NaCl loader processes.
2620 result = policy->AddRule(sandbox::TargetPolicy::SUBSYS_HANDLES, 2622 result = policy->AddRule(sandbox::TargetPolicy::SUBSYS_HANDLES,
2621 sandbox::TargetPolicy::HANDLES_DUP_ANY, 2623 sandbox::TargetPolicy::HANDLES_DUP_ANY,
2622 L"File"); 2624 L"File");
2623 return result == sandbox::SBOX_ALL_OK; 2625 return result == sandbox::SBOX_ALL_OK;
2624 } 2626 }
2625 #endif 2627 #endif
2626 2628
2629 void ChromeContentBrowserClient::RegisterRenderProcessMojoServices(
2630 content::ServiceRegistry* registry) {
2631 LOG(ERROR) << "Adding LeakDetectorMonitorImpl service";
2632 registry->AddService(base::Bind(&metrics::LeakDetectorMonitorImpl::Create));
2633 }
2634
2627 void ChromeContentBrowserClient::RegisterFrameMojoShellServices( 2635 void ChromeContentBrowserClient::RegisterFrameMojoShellServices(
2628 content::ServiceRegistry* registry, 2636 content::ServiceRegistry* registry,
2629 content::RenderFrameHost* render_frame_host) { 2637 content::RenderFrameHost* render_frame_host) {
2630 #if defined(OS_CHROMEOS) 2638 #if defined(OS_CHROMEOS)
2631 registry->AddService( 2639 registry->AddService(
2632 base::Bind(&chromeos::attestation::PlatformVerificationImpl::Create, 2640 base::Bind(&chromeos::attestation::PlatformVerificationImpl::Create,
2633 render_frame_host)); 2641 render_frame_host));
2634 #endif 2642 #endif
2635 } 2643 }
2636 2644
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
2810 if (channel <= kMaxDisableEncryptionChannel) { 2818 if (channel <= kMaxDisableEncryptionChannel) {
2811 static const char* const kWebRtcDevSwitchNames[] = { 2819 static const char* const kWebRtcDevSwitchNames[] = {
2812 switches::kDisableWebRtcEncryption, 2820 switches::kDisableWebRtcEncryption,
2813 }; 2821 };
2814 to_command_line->CopySwitchesFrom(from_command_line, 2822 to_command_line->CopySwitchesFrom(from_command_line,
2815 kWebRtcDevSwitchNames, 2823 kWebRtcDevSwitchNames,
2816 arraysize(kWebRtcDevSwitchNames)); 2824 arraysize(kWebRtcDevSwitchNames));
2817 } 2825 }
2818 } 2826 }
2819 #endif // defined(ENABLE_WEBRTC) 2827 #endif // defined(ENABLE_WEBRTC)
OLDNEW
« no previous file with comments | « chrome/browser/chrome_content_browser_client.h ('k') | chrome/chrome_renderer.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698