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

Side by Side Diff: ash/common/wm_root_window_controller.h

Issue 2623703002: Removes WmRootWindowController::GetShell() (Closed)
Patch Set: not relative Created 3 years, 11 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_COMMON_WM_ROOT_WINDOW_CONTROLLER_H_ 5 #ifndef ASH_COMMON_WM_ROOT_WINDOW_CONTROLLER_H_
6 #define ASH_COMMON_WM_ROOT_WINDOW_CONTROLLER_H_ 6 #define ASH_COMMON_WM_ROOT_WINDOW_CONTROLLER_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/common/wm/workspace/workspace_types.h" 9 #include "ash/common/wm/workspace/workspace_types.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 16 matching lines...) Expand all
27 namespace ash { 27 namespace ash {
28 28
29 class AlwaysOnTopController; 29 class AlwaysOnTopController;
30 class AnimatingWallpaperWidgetController; 30 class AnimatingWallpaperWidgetController;
31 class DockedWindowLayoutManager; 31 class DockedWindowLayoutManager;
32 class PanelLayoutManager; 32 class PanelLayoutManager;
33 class SystemModalContainerLayoutManager; 33 class SystemModalContainerLayoutManager;
34 class SystemTray; 34 class SystemTray;
35 class WallpaperWidgetController; 35 class WallpaperWidgetController;
36 class WmShelf; 36 class WmShelf;
37 class WmShell;
38 class WmWindow; 37 class WmWindow;
39 class WorkspaceController; 38 class WorkspaceController;
40 39
41 enum class LoginStatus; 40 enum class LoginStatus;
42 41
43 namespace wm { 42 namespace wm {
44 class RootWindowLayoutManager; 43 class RootWindowLayoutManager;
45 } 44 }
46 45
47 // Provides state associated with a root of a window hierarchy. 46 // Provides state associated with a root of a window hierarchy.
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 // for that is returned. Otherwise the layout manager for the default modal 85 // for that is returned. Otherwise the layout manager for the default modal
87 // container is returned. 86 // container is returned.
88 // If no window is specified (i.e. |window| is null), then the lockscreen 87 // If no window is specified (i.e. |window| is null), then the lockscreen
89 // modal container is used if the screen is currently locked. Otherwise, the 88 // modal container is used if the screen is currently locked. Otherwise, the
90 // default modal container is used. 89 // default modal container is used.
91 SystemModalContainerLayoutManager* GetSystemModalLayoutManager( 90 SystemModalContainerLayoutManager* GetSystemModalLayoutManager(
92 WmWindow* window); 91 WmWindow* window);
93 92
94 virtual bool HasShelf() = 0; 93 virtual bool HasShelf() = 0;
95 94
96 virtual WmShell* GetShell() = 0;
97
98 virtual WmShelf* GetShelf() = 0; 95 virtual WmShelf* GetShelf() = 0;
99 96
100 // Creates the shelf for this root window and notifies observers. 97 // Creates the shelf for this root window and notifies observers.
101 void CreateShelf(); 98 void CreateShelf();
102 99
103 // Returns the system tray controller. May be null for external displays. 100 // Returns the system tray controller. May be null for external displays.
104 SystemTray* GetSystemTray(); 101 SystemTray* GetSystemTray();
105 102
106 // Returns the window associated with this WmRootWindowController. 103 // Returns the window associated with this WmRootWindowController.
107 virtual WmWindow* GetWindow() = 0; 104 virtual WmWindow* GetWindow() = 0;
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 std::unique_ptr<ui::MenuModel> menu_model_; 182 std::unique_ptr<ui::MenuModel> menu_model_;
186 std::unique_ptr<views::MenuModelAdapter> menu_model_adapter_; 183 std::unique_ptr<views::MenuModelAdapter> menu_model_adapter_;
187 std::unique_ptr<views::MenuRunner> menu_runner_; 184 std::unique_ptr<views::MenuRunner> menu_runner_;
188 185
189 DISALLOW_COPY_AND_ASSIGN(WmRootWindowController); 186 DISALLOW_COPY_AND_ASSIGN(WmRootWindowController);
190 }; 187 };
191 188
192 } // namespace ash 189 } // namespace ash
193 190
194 #endif // ASH_COMMON_WM_ROOT_WINDOW_CONTROLLER_H_ 191 #endif // ASH_COMMON_WM_ROOT_WINDOW_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ash/aura/wm_root_window_controller_aura.cc ('k') | ash/mus/bridge/wm_root_window_controller_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698