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

Side by Side Diff: chrome/gpu/chrome_content_gpu_client.cc

Issue 2419723002: Move services/shell to services/service_manager (Closed)
Patch Set: rebase Created 4 years, 2 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/gpu/DEPS ('k') | chrome/renderer/DEPS » ('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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/gpu/chrome_content_gpu_client.h" 5 #include "chrome/gpu/chrome_content_gpu_client.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
11 #include "base/memory/ptr_util.h" 11 #include "base/memory/ptr_util.h"
12 #include "base/threading/platform_thread.h" 12 #include "base/threading/platform_thread.h"
13 #include "base/time/time.h" 13 #include "base/time/time.h"
14 #include "chrome/common/stack_sampling_configuration.h" 14 #include "chrome/common/stack_sampling_configuration.h"
15 #include "components/metrics/child_call_stack_profile_collector.h" 15 #include "components/metrics/child_call_stack_profile_collector.h"
16 #include "mojo/public/cpp/bindings/strong_binding.h" 16 #include "mojo/public/cpp/bindings/strong_binding.h"
17 #include "services/shell/public/cpp/connector.h" 17 #include "services/service_manager/public/cpp/connector.h"
18 #include "services/shell/public/cpp/interface_registry.h" 18 #include "services/service_manager/public/cpp/interface_registry.h"
19 19
20 #if defined(OS_CHROMEOS) 20 #if defined(OS_CHROMEOS)
21 #include "chrome/gpu/gpu_arc_video_service.h" 21 #include "chrome/gpu/gpu_arc_video_service.h"
22 #endif 22 #endif
23 23
24 namespace { 24 namespace {
25 25
26 #if defined(OS_CHROMEOS) 26 #if defined(OS_CHROMEOS)
27 void DeprecatedCreateGpuArcVideoService( 27 void DeprecatedCreateGpuArcVideoService(
28 const gpu::GpuPreferences& gpu_preferences, 28 const gpu::GpuPreferences& gpu_preferences,
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 #endif 83 #endif
84 } 84 }
85 85
86 void ChromeContentGpuClient::ConsumeInterfacesFromBrowser( 86 void ChromeContentGpuClient::ConsumeInterfacesFromBrowser(
87 shell::InterfaceProvider* provider) { 87 shell::InterfaceProvider* provider) {
88 metrics::mojom::CallStackProfileCollectorPtr browser_interface; 88 metrics::mojom::CallStackProfileCollectorPtr browser_interface;
89 provider->GetInterface(&browser_interface); 89 provider->GetInterface(&browser_interface);
90 g_call_stack_profile_collector.Get().SetParentProfileCollector( 90 g_call_stack_profile_collector.Get().SetParentProfileCollector(
91 std::move(browser_interface)); 91 std::move(browser_interface));
92 } 92 }
OLDNEW
« no previous file with comments | « chrome/gpu/DEPS ('k') | chrome/renderer/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698