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

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

Issue 2411223002: chromeos: Refactor system tray Wi-Fi connect dialog so it works with mash (Closed)
Patch Set: NON_EXPORTED_BASE 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
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 29 matching lines...) Expand all
40 class Event; 40 class Event;
41 class GpuService; 41 class GpuService;
42 class WindowTreeClient; 42 class WindowTreeClient;
43 } 43 }
44 44
45 namespace ash { 45 namespace ash {
46 namespace mus { 46 namespace mus {
47 47
48 class AcceleratorRegistrarImpl; 48 class AcceleratorRegistrarImpl;
49 class NativeWidgetFactoryMus; 49 class NativeWidgetFactoryMus;
50 class NetworkConnectDelegateMus;
50 class WindowManager; 51 class WindowManager;
51 52
52 // Hosts the window manager and the ash system user interface for mash. 53 // Hosts the window manager and the ash system user interface for mash.
53 class WindowManagerApplication 54 class WindowManagerApplication
54 : public shell::Service, 55 : public shell::Service,
55 public shell::InterfaceFactory<mojom::WallpaperController>, 56 public shell::InterfaceFactory<mojom::WallpaperController>,
56 public shell::InterfaceFactory<ui::mojom::AcceleratorRegistrar>, 57 public shell::InterfaceFactory<ui::mojom::AcceleratorRegistrar>,
57 public mash::session::mojom::ScreenlockStateListener { 58 public mash::session::mojom::ScreenlockStateListener {
58 public: 59 public:
59 WindowManagerApplication(); 60 WindowManagerApplication();
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 mojo::BindingSet<mojom::WallpaperController> wallpaper_controller_bindings_; 109 mojo::BindingSet<mojom::WallpaperController> wallpaper_controller_bindings_;
109 110
110 std::set<AcceleratorRegistrarImpl*> accelerator_registrars_; 111 std::set<AcceleratorRegistrarImpl*> accelerator_registrars_;
111 112
112 mash::session::mojom::SessionPtr session_; 113 mash::session::mojom::SessionPtr session_;
113 114
114 mojo::Binding<mash::session::mojom::ScreenlockStateListener> 115 mojo::Binding<mash::session::mojom::ScreenlockStateListener>
115 screenlock_state_listener_binding_; 116 screenlock_state_listener_binding_;
116 117
117 #if defined(OS_CHROMEOS) 118 #if defined(OS_CHROMEOS)
118 class StubNetworkConnectDelegate; 119 std::unique_ptr<NetworkConnectDelegateMus> network_connect_delegate_;
119 std::unique_ptr<StubNetworkConnectDelegate> network_connect_delegate_;
120 std::unique_ptr<chromeos::system::ScopedFakeStatisticsProvider> 120 std::unique_ptr<chromeos::system::ScopedFakeStatisticsProvider>
121 statistics_provider_; 121 statistics_provider_;
122 #endif 122 #endif
123 123
124 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication); 124 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication);
125 }; 125 };
126 126
127 } // namespace mus 127 } // namespace mus
128 } // namespace ash 128 } // namespace ash
129 129
130 #endif // ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ 130 #endif // ASH_MUS_WINDOW_MANAGER_APPLICATION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698