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

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

Issue 2394503003: mustash: Fix crash when clicking on network in system tray (Closed)
Patch Set: 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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 private: 68 private:
69 friend class WmTestBase; 69 friend class WmTestBase;
70 friend class WmTestHelper; 70 friend class WmTestHelper;
71 71
72 void OnAcceleratorRegistrarDestroyed(AcceleratorRegistrarImpl* registrar); 72 void OnAcceleratorRegistrarDestroyed(AcceleratorRegistrarImpl* registrar);
73 73
74 void InitWindowManager( 74 void InitWindowManager(
75 std::unique_ptr<ui::WindowTreeClient> window_tree_client, 75 std::unique_ptr<ui::WindowTreeClient> window_tree_client,
76 const scoped_refptr<base::SequencedWorkerPool>& blocking_pool); 76 const scoped_refptr<base::SequencedWorkerPool>& blocking_pool);
77 77
78 // Initializes lower-level OS-specific components (e.g. D-Bus services).
79 void InitializeComponents();
80 void ShutdownComponents();
81
78 // shell::Service: 82 // shell::Service:
79 void OnStart(const shell::Identity& identity) override; 83 void OnStart(const shell::Identity& identity) override;
80 bool OnConnect(const shell::Identity& remote_identity, 84 bool OnConnect(const shell::Identity& remote_identity,
81 shell::InterfaceRegistry* registry) override; 85 shell::InterfaceRegistry* registry) override;
82 86
83 // InterfaceFactory<mojom::ShelfController>: 87 // InterfaceFactory<mojom::ShelfController>:
84 void Create(const shell::Identity& remote_identity, 88 void Create(const shell::Identity& remote_identity,
85 mojom::ShelfControllerRequest request) override; 89 mojom::ShelfControllerRequest request) override;
86 90
87 // InterfaceFactory<mojom::WallpaperController>: 91 // InterfaceFactory<mojom::WallpaperController>:
(...skipping 23 matching lines...) Expand all
111 mojo::BindingSet<mojom::WallpaperController> wallpaper_controller_bindings_; 115 mojo::BindingSet<mojom::WallpaperController> wallpaper_controller_bindings_;
112 116
113 std::set<AcceleratorRegistrarImpl*> accelerator_registrars_; 117 std::set<AcceleratorRegistrarImpl*> accelerator_registrars_;
114 118
115 mash::session::mojom::SessionPtr session_; 119 mash::session::mojom::SessionPtr session_;
116 120
117 mojo::Binding<mash::session::mojom::ScreenlockStateListener> 121 mojo::Binding<mash::session::mojom::ScreenlockStateListener>
118 screenlock_state_listener_binding_; 122 screenlock_state_listener_binding_;
119 123
120 #if defined(OS_CHROMEOS) 124 #if defined(OS_CHROMEOS)
125 class StubNetworkConnectDelegate;
126 std::unique_ptr<StubNetworkConnectDelegate> network_connect_delegate_;
121 std::unique_ptr<chromeos::system::ScopedFakeStatisticsProvider> 127 std::unique_ptr<chromeos::system::ScopedFakeStatisticsProvider>
122 statistics_provider_; 128 statistics_provider_;
123 #endif 129 #endif
124 130
125 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication); 131 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication);
126 }; 132 };
127 133
128 } // namespace mus 134 } // namespace mus
129 } // namespace ash 135 } // namespace ash
130 136
131 #endif // ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ 137 #endif // ASH_MUS_WINDOW_MANAGER_APPLICATION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698