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

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

Issue 2166553003: Revert of Mojo interface/service for Leak Detector on remote process (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 #endif 318 #endif
319 319
320 #if defined(ENABLE_MOJO_MEDIA) 320 #if defined(ENABLE_MOJO_MEDIA)
321 #include "chrome/browser/media/output_protection_impl.h" 321 #include "chrome/browser/media/output_protection_impl.h"
322 #endif 322 #endif
323 323
324 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) 324 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
325 #include "media/mojo/services/mojo_media_application_factory.h" // nogncheck 325 #include "media/mojo/services/mojo_media_application_factory.h" // nogncheck
326 #endif 326 #endif
327 327
328 #if defined(OS_CHROMEOS)
329 #include "chrome/browser/metrics/leak_detector/leak_detector_remote_controller.h "
330 #endif
331
332 using base::FileDescriptor; 328 using base::FileDescriptor;
333 using blink::WebWindowFeatures; 329 using blink::WebWindowFeatures;
334 using content::AccessTokenStore; 330 using content::AccessTokenStore;
335 using content::BrowserThread; 331 using content::BrowserThread;
336 using content::BrowserURLHandler; 332 using content::BrowserURLHandler;
337 using content::ChildProcessSecurityPolicy; 333 using content::ChildProcessSecurityPolicy;
338 using content::QuotaPermissionContext; 334 using content::QuotaPermissionContext;
339 using content::RenderFrameHost; 335 using content::RenderFrameHost;
340 using content::RenderViewHost; 336 using content::RenderViewHost;
341 using content::ResourceType; 337 using content::ResourceType;
(...skipping 2442 matching lines...) Expand 10 before | Expand all | Expand 10 after
2784 2780
2785 return false; 2781 return false;
2786 } 2782 }
2787 #endif // defined(OS_WIN) 2783 #endif // defined(OS_WIN)
2788 2784
2789 void ChromeContentBrowserClient::ExposeInterfacesToRenderer( 2785 void ChromeContentBrowserClient::ExposeInterfacesToRenderer(
2790 shell::InterfaceRegistry* registry, 2786 shell::InterfaceRegistry* registry,
2791 content::RenderProcessHost* render_process_host) { 2787 content::RenderProcessHost* render_process_host) {
2792 registry->AddInterface( 2788 registry->AddInterface(
2793 base::Bind(&startup_metric_utils::StartupMetricHostImpl::Create)); 2789 base::Bind(&startup_metric_utils::StartupMetricHostImpl::Create));
2794
2795 #if defined(OS_CHROMEOS)
2796 registry->AddInterface<metrics::mojom::LeakDetector>(
2797 base::Bind(&metrics::LeakDetectorRemoteController::Create));
2798 #endif
2799 } 2790 }
2800 2791
2801 void ChromeContentBrowserClient::RegisterFrameMojoShellInterfaces( 2792 void ChromeContentBrowserClient::RegisterFrameMojoShellInterfaces(
2802 shell::InterfaceRegistry* registry, 2793 shell::InterfaceRegistry* registry,
2803 content::RenderFrameHost* render_frame_host) { 2794 content::RenderFrameHost* render_frame_host) {
2804 // TODO(xhwang): Only register this when ENABLE_MOJO_MEDIA. 2795 // TODO(xhwang): Only register this when ENABLE_MOJO_MEDIA.
2805 #if defined(OS_CHROMEOS) 2796 #if defined(OS_CHROMEOS)
2806 registry->AddInterface( 2797 registry->AddInterface(
2807 base::Bind(&chromeos::attestation::PlatformVerificationImpl::Create, 2798 base::Bind(&chromeos::attestation::PlatformVerificationImpl::Create,
2808 render_frame_host)); 2799 render_frame_host));
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
3056 if (channel <= kMaxDisableEncryptionChannel) { 3047 if (channel <= kMaxDisableEncryptionChannel) {
3057 static const char* const kWebRtcDevSwitchNames[] = { 3048 static const char* const kWebRtcDevSwitchNames[] = {
3058 switches::kDisableWebRtcEncryption, 3049 switches::kDisableWebRtcEncryption,
3059 }; 3050 };
3060 to_command_line->CopySwitchesFrom(from_command_line, 3051 to_command_line->CopySwitchesFrom(from_command_line,
3061 kWebRtcDevSwitchNames, 3052 kWebRtcDevSwitchNames,
3062 arraysize(kWebRtcDevSwitchNames)); 3053 arraysize(kWebRtcDevSwitchNames));
3063 } 3054 }
3064 } 3055 }
3065 #endif // defined(ENABLE_WEBRTC) 3056 #endif // defined(ENABLE_WEBRTC)
OLDNEW
« no previous file with comments | « chrome/browser/BUILD.gn ('k') | chrome/browser/metrics/leak_detector/leak_detector_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698