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

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

Issue 2559343003: mus: Rename GpuService to Gpu. (Closed)
Patch Set: . Created 4 years 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 | « no previous file | 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 21 matching lines...) Expand all
32 namespace system { 32 namespace system {
33 class ScopedFakeStatisticsProvider; 33 class ScopedFakeStatisticsProvider;
34 } 34 }
35 } 35 }
36 36
37 namespace views { 37 namespace views {
38 class AuraInit; 38 class AuraInit;
39 } 39 }
40 40
41 namespace ui { 41 namespace ui {
42 class GpuService; 42 class Gpu;
43 } 43 }
44 44
45 namespace ash { 45 namespace ash {
46 namespace mus { 46 namespace mus {
47 47
48 class NetworkConnectDelegateMus; 48 class NetworkConnectDelegateMus;
49 class WindowManager; 49 class WindowManager;
50 50
51 // Hosts the window manager and the ash system user interface for mash. 51 // Hosts the window manager and the ash system user interface for mash.
52 class WindowManagerApplication 52 class WindowManagerApplication
(...skipping 24 matching lines...) Expand all
77 bool OnConnect(const service_manager::ServiceInfo& remote_info, 77 bool OnConnect(const service_manager::ServiceInfo& remote_info,
78 service_manager::InterfaceRegistry* registry) override; 78 service_manager::InterfaceRegistry* registry) override;
79 79
80 // session::mojom::ScreenlockStateListener: 80 // session::mojom::ScreenlockStateListener:
81 void ScreenlockStateChanged(bool locked) override; 81 void ScreenlockStateChanged(bool locked) override;
82 82
83 tracing::Provider tracing_; 83 tracing::Provider tracing_;
84 84
85 std::unique_ptr<views::AuraInit> aura_init_; 85 std::unique_ptr<views::AuraInit> aura_init_;
86 86
87 std::unique_ptr<ui::GpuService> gpu_service_; 87 std::unique_ptr<ui::Gpu> gpu_;
88 std::unique_ptr<aura::MusContextFactory> compositor_context_factory_; 88 std::unique_ptr<aura::MusContextFactory> compositor_context_factory_;
89 std::unique_ptr<WindowManager> window_manager_; 89 std::unique_ptr<WindowManager> window_manager_;
90 90
91 // 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.
92 scoped_refptr<base::SequencedWorkerPool> blocking_pool_; 92 scoped_refptr<base::SequencedWorkerPool> blocking_pool_;
93 93
94 mash::session::mojom::SessionPtr session_; 94 mash::session::mojom::SessionPtr session_;
95 95
96 mojo::Binding<mash::session::mojom::ScreenlockStateListener> 96 mojo::Binding<mash::session::mojom::ScreenlockStateListener>
97 screenlock_state_listener_binding_; 97 screenlock_state_listener_binding_;
98 98
99 #if defined(OS_CHROMEOS) 99 #if defined(OS_CHROMEOS)
100 std::unique_ptr<NetworkConnectDelegateMus> network_connect_delegate_; 100 std::unique_ptr<NetworkConnectDelegateMus> network_connect_delegate_;
101 std::unique_ptr<chromeos::system::ScopedFakeStatisticsProvider> 101 std::unique_ptr<chromeos::system::ScopedFakeStatisticsProvider>
102 statistics_provider_; 102 statistics_provider_;
103 #endif 103 #endif
104 104
105 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication); 105 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication);
106 }; 106 };
107 107
108 } // namespace mus 108 } // namespace mus
109 } // namespace ash 109 } // namespace ash
110 110
111 #endif // ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ 111 #endif // ASH_MUS_WINDOW_MANAGER_APPLICATION_H_
OLDNEW
« no previous file with comments | « no previous file | ash/mus/window_manager_application.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698