OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_ROOT_WINDOW_CONTROLLER_H_ | 5 #ifndef ASH_ROOT_WINDOW_CONTROLLER_H_ |
6 #define ASH_ROOT_WINDOW_CONTROLLER_H_ | 6 #define ASH_ROOT_WINDOW_CONTROLLER_H_ |
7 | 7 |
8 #include <map> | 8 #include <map> |
9 #include <memory> | 9 #include <memory> |
10 #include <vector> | 10 #include <vector> |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
46 } | 46 } |
47 | 47 |
48 namespace ash { | 48 namespace ash { |
49 class AlwaysOnTopController; | 49 class AlwaysOnTopController; |
50 class AnimatingWallpaperWidgetController; | 50 class AnimatingWallpaperWidgetController; |
51 class AshTouchExplorationManager; | 51 class AshTouchExplorationManager; |
52 class AshWindowTreeHost; | 52 class AshWindowTreeHost; |
53 class BootSplashScreen; | 53 class BootSplashScreen; |
54 enum class LoginStatus; | 54 enum class LoginStatus; |
55 class PanelLayoutManager; | 55 class PanelLayoutManager; |
56 class Shelf; | |
56 class ShelfLayoutManager; | 57 class ShelfLayoutManager; |
57 class StackingController; | 58 class StackingController; |
58 class StatusAreaWidget; | 59 class StatusAreaWidget; |
59 class SystemModalContainerLayoutManager; | 60 class SystemModalContainerLayoutManager; |
60 class SystemTray; | 61 class SystemTray; |
61 class SystemWallpaperController; | 62 class SystemWallpaperController; |
62 class TouchHudDebug; | 63 class TouchHudDebug; |
63 class TouchHudProjection; | 64 class TouchHudProjection; |
64 class WallpaperWidgetController; | 65 class WallpaperWidgetController; |
65 class WmShelf; | |
66 class WorkspaceController; | 66 class WorkspaceController; |
67 | 67 |
68 namespace mus { | 68 namespace mus { |
69 class WindowManager; | 69 class WindowManager; |
70 } | 70 } |
71 | 71 |
72 namespace wm { | 72 namespace wm { |
73 class RootWindowLayoutManager; | 73 class RootWindowLayoutManager; |
74 } | 74 } |
75 | 75 |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
130 const_cast<const RootWindowController*>(this)->GetWindow()); | 130 const_cast<const RootWindowController*>(this)->GetWindow()); |
131 } | 131 } |
132 const WmWindow* GetWindow() const; | 132 const WmWindow* GetWindow() const; |
133 | 133 |
134 WorkspaceController* workspace_controller() { | 134 WorkspaceController* workspace_controller() { |
135 return workspace_controller_.get(); | 135 return workspace_controller_.get(); |
136 } | 136 } |
137 | 137 |
138 wm::WorkspaceWindowState GetWorkspaceWindowState(); | 138 wm::WorkspaceWindowState GetWorkspaceWindowState(); |
139 | 139 |
140 WmShelf* wm_shelf() const { return wm_shelf_.get(); } | 140 Shelf* shelf() const { return shelf_.get(); } |
141 // TODO(jamescook): Eliminate in favor of wm_shelf(). | 141 // TODO(jamescook): Eliminate in favor of shelf(). |
142 WmShelf* GetShelf() const { return wm_shelf_.get(); } | 142 Shelf* GetShelf() const { return shelf_.get(); } |
James Cook
2017/05/24 09:30:37
I didn't fix this because the CL was getting too b
msw
2017/05/24 18:42:58
Acknowledged.
| |
143 | 143 |
144 // Initializes the shelf for this root window and notifies observers. | 144 // Initializes the shelf for this root window and notifies observers. |
145 void InitializeShelf(); | 145 void InitializeShelf(); |
146 | 146 |
147 // Get touch HUDs associated with this root window controller. | 147 // Get touch HUDs associated with this root window controller. |
148 TouchHudDebug* touch_hud_debug() const { return touch_hud_debug_; } | 148 TouchHudDebug* touch_hud_debug() const { return touch_hud_debug_; } |
149 TouchHudProjection* touch_hud_projection() const { | 149 TouchHudProjection* touch_hud_projection() const { |
150 return touch_hud_projection_; | 150 return touch_hud_projection_; |
151 } | 151 } |
152 | 152 |
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
341 // Manages the context menu. | 341 // Manages the context menu. |
342 std::unique_ptr<ui::MenuModel> menu_model_; | 342 std::unique_ptr<ui::MenuModel> menu_model_; |
343 std::unique_ptr<views::MenuModelAdapter> menu_model_adapter_; | 343 std::unique_ptr<views::MenuModelAdapter> menu_model_adapter_; |
344 std::unique_ptr<views::MenuRunner> menu_runner_; | 344 std::unique_ptr<views::MenuRunner> menu_runner_; |
345 | 345 |
346 std::unique_ptr<StackingController> stacking_controller_; | 346 std::unique_ptr<StackingController> stacking_controller_; |
347 | 347 |
348 // The shelf controller for this root window. Exists for the entire lifetime | 348 // The shelf controller for this root window. Exists for the entire lifetime |
349 // of the RootWindowController so that it is safe for observers to be added | 349 // of the RootWindowController so that it is safe for observers to be added |
350 // to it during construction of the shelf widget and status tray. | 350 // to it during construction of the shelf widget and status tray. |
351 std::unique_ptr<WmShelf> wm_shelf_; | 351 std::unique_ptr<Shelf> shelf_; |
352 | 352 |
353 // TODO(jamescook): Eliminate this. It is left over from legacy shelf code and | 353 // TODO(jamescook): Eliminate this. It is left over from legacy shelf code and |
354 // doesn't mean anything in particular. | 354 // doesn't mean anything in particular. |
355 bool shelf_initialized_ = false; | 355 bool shelf_initialized_ = false; |
356 | 356 |
357 std::unique_ptr<SystemWallpaperController> system_wallpaper_; | 357 std::unique_ptr<SystemWallpaperController> system_wallpaper_; |
358 | 358 |
359 std::unique_ptr<BootSplashScreen> boot_splash_screen_; | 359 std::unique_ptr<BootSplashScreen> boot_splash_screen_; |
360 // Responsible for initializing TouchExplorationController when spoken | 360 // Responsible for initializing TouchExplorationController when spoken |
361 // feedback is on. | 361 // feedback is on. |
(...skipping 16 matching lines...) Expand all Loading... | |
378 | 378 |
379 // On classic ash, returns the RootWindowController for the given |root_window|. | 379 // On classic ash, returns the RootWindowController for the given |root_window|. |
380 // On mus ash, returns the RootWindowController for the primary display. | 380 // On mus ash, returns the RootWindowController for the primary display. |
381 // See RootWindowController class comment above. | 381 // See RootWindowController class comment above. |
382 ASH_EXPORT RootWindowController* GetRootWindowController( | 382 ASH_EXPORT RootWindowController* GetRootWindowController( |
383 const aura::Window* root_window); | 383 const aura::Window* root_window); |
384 | 384 |
385 } // namespace ash | 385 } // namespace ash |
386 | 386 |
387 #endif // ASH_ROOT_WINDOW_CONTROLLER_H_ | 387 #endif // ASH_ROOT_WINDOW_CONTROLLER_H_ |
OLD | NEW |