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

Side by Side Diff: ash/root_window_controller.h

Issue 2648483002: chromeos: Rename various CreateShelf methods to CreateShelfView (Closed)
Patch Set: 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 (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 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 } 137 }
138 138
139 wm::WorkspaceWindowState GetWorkspaceWindowState(); 139 wm::WorkspaceWindowState GetWorkspaceWindowState();
140 140
141 WmShelf* wm_shelf() const { return wm_shelf_.get(); } 141 WmShelf* wm_shelf() const { return wm_shelf_.get(); }
142 142
143 bool HasShelf(); 143 bool HasShelf();
144 144
145 WmShelf* GetShelf(); 145 WmShelf* GetShelf();
146 146
147 // Creates the shelf for this root window and notifies observers. 147 // Creates the shelf view for this root window and notifies observers.
148 void CreateShelf(); 148 void CreateShelfView();
149 149
150 // Get touch HUDs associated with this root window controller. 150 // Get touch HUDs associated with this root window controller.
151 TouchHudDebug* touch_hud_debug() const { return touch_hud_debug_; } 151 TouchHudDebug* touch_hud_debug() const { return touch_hud_debug_; }
152 TouchHudProjection* touch_hud_projection() const { 152 TouchHudProjection* touch_hud_projection() const {
153 return touch_hud_projection_; 153 return touch_hud_projection_;
154 } 154 }
155 155
156 // Set touch HUDs for this root window controller. The root window controller 156 // Set touch HUDs for this root window controller. The root window controller
157 // will not own the HUDs; their lifetimes are managed by themselves. Whenever 157 // will not own the HUDs; their lifetimes are managed by themselves. Whenever
158 // the widget showing a HUD is being destroyed (e.g. because of detaching a 158 // the widget showing a HUD is being destroyed (e.g. because of detaching a
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
384 384
385 // On classic ash, returns the RootWindowController for the given |root_window|. 385 // On classic ash, returns the RootWindowController for the given |root_window|.
386 // On mus ash, returns the RootWindowController for the primary display. 386 // On mus ash, returns the RootWindowController for the primary display.
387 // See RootWindowController class comment above. 387 // See RootWindowController class comment above.
388 ASH_EXPORT RootWindowController* GetRootWindowController( 388 ASH_EXPORT RootWindowController* GetRootWindowController(
389 const aura::Window* root_window); 389 const aura::Window* root_window);
390 390
391 } // namespace ash 391 } // namespace ash
392 392
393 #endif // ASH_ROOT_WINDOW_CONTROLLER_H_ 393 #endif // ASH_ROOT_WINDOW_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698