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

Side by Side Diff: ash/root_window_controller.h

Issue 2247503002: mash: Create and show a shelf in mash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleanup. Created 4 years, 4 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 10
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 273
274 std::unique_ptr<RootWindowControllerCommon> root_window_controller_common_; 274 std::unique_ptr<RootWindowControllerCommon> root_window_controller_common_;
275 275
276 std::unique_ptr<StackingController> stacking_controller_; 276 std::unique_ptr<StackingController> stacking_controller_;
277 277
278 // The shelf controller for this root window. Exists for the entire lifetime 278 // The shelf controller for this root window. Exists for the entire lifetime
279 // of the RootWindowController so that it is safe for observers to be added 279 // of the RootWindowController so that it is safe for observers to be added
280 // to it during construction of the shelf widget and status tray. 280 // to it during construction of the shelf widget and status tray.
281 std::unique_ptr<WmShelfAura> wm_shelf_aura_; 281 std::unique_ptr<WmShelfAura> wm_shelf_aura_;
282 282
283 // Legacy shelf controller. Only present after shelf is created (post-login).
284 std::unique_ptr<Shelf> shelf_;
285
286 // The shelf widget for this root window. 283 // The shelf widget for this root window.
287 std::unique_ptr<ShelfWidget> shelf_widget_; 284 std::unique_ptr<ShelfWidget> shelf_widget_;
288 285
289 // An invisible/empty window used as a event target for 286 // An invisible/empty window used as a event target for
290 // |MouseCursorEventFilter| before a user logs in. 287 // |MouseCursorEventFilter| before a user logs in.
291 // (crbug.com/266987) 288 // (crbug.com/266987)
292 // Its container is |LockScreenBackgroundContainer| and 289 // Its container is |LockScreenBackgroundContainer| and
293 // this must be deleted before the container is deleted. 290 // this must be deleted before the container is deleted.
294 std::unique_ptr<aura::Window> mouse_event_target_; 291 std::unique_ptr<aura::Window> mouse_event_target_;
295 292
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 330
334 // On classic ash, returns the RootWindowController for the given |root_window|. 331 // On classic ash, returns the RootWindowController for the given |root_window|.
335 // On mus ash, returns the RootWindowController for the primary display. 332 // On mus ash, returns the RootWindowController for the primary display.
336 // See RootWindowController class comment above. 333 // See RootWindowController class comment above.
337 ASH_EXPORT RootWindowController* GetRootWindowController( 334 ASH_EXPORT RootWindowController* GetRootWindowController(
338 const aura::Window* root_window); 335 const aura::Window* root_window);
339 336
340 } // namespace ash 337 } // namespace ash
341 338
342 #endif // ASH_ROOT_WINDOW_CONTROLLER_H_ 339 #endif // ASH_ROOT_WINDOW_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698