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

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

Issue 2690363002: chromeos: removes mash shadows (Closed)
Patch Set: merge Created 3 years, 10 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 | « ash/mus/shadow_controller.cc ('k') | ash/mus/window_manager.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_H_ 5 #ifndef ASH_MUS_WINDOW_MANAGER_H_
6 #define ASH_MUS_WINDOW_MANAGER_H_ 6 #define ASH_MUS_WINDOW_MANAGER_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 30 matching lines...) Expand all
41 41
42 namespace ash { 42 namespace ash {
43 43
44 class RootWindowController; 44 class RootWindowController;
45 class ScreenMus; 45 class ScreenMus;
46 class ShellDelegate; 46 class ShellDelegate;
47 47
48 namespace mus { 48 namespace mus {
49 49
50 class AcceleratorHandler; 50 class AcceleratorHandler;
51 class ShadowController;
52 class WmLookupMus; 51 class WmLookupMus;
53 class WmTestHelper; 52 class WmTestHelper;
54 53
55 // WindowManager serves as the WindowManagerDelegate and 54 // WindowManager serves as the WindowManagerDelegate and
56 // WindowTreeClientDelegate for mash. WindowManager creates (and owns) 55 // WindowTreeClientDelegate for mash. WindowManager creates (and owns)
57 // a RootWindowController per Display. WindowManager takes ownership of 56 // a RootWindowController per Display. WindowManager takes ownership of
58 // the WindowTreeClient. 57 // the WindowTreeClient.
59 class WindowManager : public aura::WindowManagerDelegate, 58 class WindowManager : public aura::WindowManagerDelegate,
60 public aura::WindowTreeClientDelegate { 59 public aura::WindowTreeClientDelegate {
61 public: 60 public:
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 std::unique_ptr<::wm::WMState> wm_state_; 171 std::unique_ptr<::wm::WMState> wm_state_;
173 std::unique_ptr<aura::PropertyConverter> property_converter_; 172 std::unique_ptr<aura::PropertyConverter> property_converter_;
174 173
175 std::unique_ptr<aura::WindowTreeClient> window_tree_client_; 174 std::unique_ptr<aura::WindowTreeClient> window_tree_client_;
176 175
177 aura::WindowManagerClient* window_manager_client_ = nullptr; 176 aura::WindowManagerClient* window_manager_client_ = nullptr;
178 177
179 std::unique_ptr<views::PointerWatcherEventRouter> 178 std::unique_ptr<views::PointerWatcherEventRouter>
180 pointer_watcher_event_router_; 179 pointer_watcher_event_router_;
181 180
182 std::unique_ptr<ShadowController> shadow_controller_;
183
184 RootWindowControllers root_window_controllers_; 181 RootWindowControllers root_window_controllers_;
185 182
186 std::unique_ptr<ScreenMus> screen_; 183 std::unique_ptr<ScreenMus> screen_;
187 184
188 bool created_shell_ = false; 185 bool created_shell_ = false;
189 186
190 std::unique_ptr<WmLookupMus> lookup_; 187 std::unique_ptr<WmLookupMus> lookup_;
191 188
192 std::map<uint16_t, AcceleratorHandler*> accelerator_handlers_; 189 std::map<uint16_t, AcceleratorHandler*> accelerator_handlers_;
193 uint16_t next_accelerator_namespace_id_ = 0u; 190 uint16_t next_accelerator_namespace_id_ = 0u;
194 191
195 scoped_refptr<base::SequencedWorkerPool> blocking_pool_; 192 scoped_refptr<base::SequencedWorkerPool> blocking_pool_;
196 193
197 // Only set in tests. If non-null this is used as the shell delegate. 194 // Only set in tests. If non-null this is used as the shell delegate.
198 std::unique_ptr<ShellDelegate> shell_delegate_for_test_; 195 std::unique_ptr<ShellDelegate> shell_delegate_for_test_;
199 196
200 DISALLOW_COPY_AND_ASSIGN(WindowManager); 197 DISALLOW_COPY_AND_ASSIGN(WindowManager);
201 }; 198 };
202 199
203 } // namespace mus 200 } // namespace mus
204 } // namespace ash 201 } // namespace ash
205 202
206 #endif // ASH_MUS_WINDOW_MANAGER_H_ 203 #endif // ASH_MUS_WINDOW_MANAGER_H_
OLDNEW
« no previous file with comments | « ash/mus/shadow_controller.cc ('k') | ash/mus/window_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698