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

Side by Side Diff: ash/mus/window_manager_application.h

Issue 2487573002: Service Manager: Remove ServiceContext* arg from Service::OnStart() (Closed)
Patch Set: rebase Created 4 years, 1 month 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 | « ash/autoclick/mus/autoclick_application.cc ('k') | ash/mus/window_manager_application.cc » ('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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 #ifndef ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ 5 #ifndef ASH_MUS_WINDOW_MANAGER_APPLICATION_H_
6 #define ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ 6 #define ASH_MUS_WINDOW_MANAGER_APPLICATION_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 11 matching lines...) Expand all
22 namespace base { 22 namespace base {
23 class SequencedWorkerPool; 23 class SequencedWorkerPool;
24 } 24 }
25 25
26 namespace chromeos { 26 namespace chromeos {
27 namespace system { 27 namespace system {
28 class ScopedFakeStatisticsProvider; 28 class ScopedFakeStatisticsProvider;
29 } 29 }
30 } 30 }
31 31
32 namespace service_manager {
33 class ServiceContext;
34 }
35
36 namespace views { 32 namespace views {
37 class AuraInit; 33 class AuraInit;
38 class SurfaceContextFactory; 34 class SurfaceContextFactory;
39 } 35 }
40 36
41 namespace ui { 37 namespace ui {
42 class Event; 38 class Event;
43 class GpuService; 39 class GpuService;
44 class WindowTreeClient; 40 class WindowTreeClient;
45 } 41 }
(...skipping 23 matching lines...) Expand all
69 65
70 void InitWindowManager( 66 void InitWindowManager(
71 std::unique_ptr<ui::WindowTreeClient> window_tree_client, 67 std::unique_ptr<ui::WindowTreeClient> window_tree_client,
72 const scoped_refptr<base::SequencedWorkerPool>& blocking_pool); 68 const scoped_refptr<base::SequencedWorkerPool>& blocking_pool);
73 69
74 // Initializes lower-level OS-specific components (e.g. D-Bus services). 70 // Initializes lower-level OS-specific components (e.g. D-Bus services).
75 void InitializeComponents(); 71 void InitializeComponents();
76 void ShutdownComponents(); 72 void ShutdownComponents();
77 73
78 // service_manager::Service: 74 // service_manager::Service:
79 void OnStart(service_manager::ServiceContext* context) override; 75 void OnStart() override;
80 bool OnConnect(const service_manager::ServiceInfo& remote_info, 76 bool OnConnect(const service_manager::ServiceInfo& remote_info,
81 service_manager::InterfaceRegistry* registry) override; 77 service_manager::InterfaceRegistry* registry) override;
82 78
83 // session::mojom::ScreenlockStateListener: 79 // session::mojom::ScreenlockStateListener:
84 void ScreenlockStateChanged(bool locked) override; 80 void ScreenlockStateChanged(bool locked) override;
85 81
86 service_manager::ServiceContext* context_ = nullptr;
87
88 tracing::Provider tracing_; 82 tracing::Provider tracing_;
89 83
90 std::unique_ptr<views::AuraInit> aura_init_; 84 std::unique_ptr<views::AuraInit> aura_init_;
91 std::unique_ptr<NativeWidgetFactoryMus> native_widget_factory_mus_; 85 std::unique_ptr<NativeWidgetFactoryMus> native_widget_factory_mus_;
92 86
93 std::unique_ptr<ui::GpuService> gpu_service_; 87 std::unique_ptr<ui::GpuService> gpu_service_;
94 std::unique_ptr<views::SurfaceContextFactory> compositor_context_factory_; 88 std::unique_ptr<views::SurfaceContextFactory> compositor_context_factory_;
95 std::unique_ptr<WindowManager> window_manager_; 89 std::unique_ptr<WindowManager> window_manager_;
96 90
97 // A blocking pool used by the WindowManager's shell; not used in tests. 91 // A blocking pool used by the WindowManager's shell; not used in tests.
(...skipping 10 matching lines...) Expand all
108 statistics_provider_; 102 statistics_provider_;
109 #endif 103 #endif
110 104
111 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication); 105 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication);
112 }; 106 };
113 107
114 } // namespace mus 108 } // namespace mus
115 } // namespace ash 109 } // namespace ash
116 110
117 #endif // ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ 111 #endif // ASH_MUS_WINDOW_MANAGER_APPLICATION_H_
OLDNEW
« no previous file with comments | « ash/autoclick/mus/autoclick_application.cc ('k') | ash/mus/window_manager_application.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698