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

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

Issue 2393083005: Moves Shell::CreateShelf() to WmShell (Closed)
Patch Set: tweak 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
« no previous file with comments | « no previous file | ash/common/wm_root_window_controller.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 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 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 // default modal container is used. 87 // default modal container is used.
88 SystemModalContainerLayoutManager* GetSystemModalLayoutManager( 88 SystemModalContainerLayoutManager* GetSystemModalLayoutManager(
89 WmWindow* window); 89 WmWindow* window);
90 90
91 virtual bool HasShelf() = 0; 91 virtual bool HasShelf() = 0;
92 92
93 virtual WmShell* GetShell() = 0; 93 virtual WmShell* GetShell() = 0;
94 94
95 virtual WmShelf* GetShelf() = 0; 95 virtual WmShelf* GetShelf() = 0;
96 96
97 // Creates the shelf for this root window and notifies observers.
98 void CreateShelf();
msw 2016/10/07 01:11:31 nit: update CL title and description (s/Show/Creat
99
97 // Show shelf view if it was created hidden (before session has started). 100 // Show shelf view if it was created hidden (before session has started).
98 // TODO(jamescook): Eliminate this and handle show via Shelf. 101 // TODO(jamescook): Eliminate this and handle show via Shelf.
99 void ShowShelf(); 102 void ShowShelf();
100 103
101 // Returns the window associated with this WmRootWindowController. 104 // Returns the window associated with this WmRootWindowController.
102 virtual WmWindow* GetWindow() = 0; 105 virtual WmWindow* GetWindow() = 0;
103 106
104 // Gets the WmWindow whose shell window id is |container_id|. 107 // Gets the WmWindow whose shell window id is |container_id|.
105 WmWindow* GetContainer(int container_id); 108 WmWindow* GetContainer(int container_id);
106 const WmWindow* GetContainer(int container_id) const; 109 const WmWindow* GetContainer(int container_id) const;
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 std::unique_ptr<ui::MenuModel> menu_model_; 179 std::unique_ptr<ui::MenuModel> menu_model_;
177 std::unique_ptr<views::MenuModelAdapter> menu_model_adapter_; 180 std::unique_ptr<views::MenuModelAdapter> menu_model_adapter_;
178 std::unique_ptr<views::MenuRunner> menu_runner_; 181 std::unique_ptr<views::MenuRunner> menu_runner_;
179 182
180 DISALLOW_COPY_AND_ASSIGN(WmRootWindowController); 183 DISALLOW_COPY_AND_ASSIGN(WmRootWindowController);
181 }; 184 };
182 185
183 } // namespace ash 186 } // namespace ash
184 187
185 #endif // ASH_COMMON_WM_ROOT_WINDOW_CONTROLLER_H_ 188 #endif // ASH_COMMON_WM_ROOT_WINDOW_CONTROLLER_H_
OLDNEW
« no previous file with comments | « no previous file | ash/common/wm_root_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698