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

Unified Diff: ash/root_window_controller.h

Issue 2020623004: ash: Move shelf alignment and auto-hide calls from Shell to Shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc ('k') | ash/root_window_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/root_window_controller.h
diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h
index 1dcf688f7eaefc07177170d23bc1b861c5052682..afe2f2799b7d21877aa01f7e4d4ac3fbd26b72e1 100644
--- a/ash/root_window_controller.h
+++ b/ash/root_window_controller.h
@@ -57,6 +57,7 @@ class DesktopBackgroundWidgetController;
class DockedWindowLayoutManager;
class PanelLayoutManager;
class RootWindowLayoutManager;
+class Shelf;
class ShelfLayoutManager;
class ShelfWidget;
class StackingController;
@@ -124,6 +125,7 @@ class ASH_EXPORT RootWindowController : public ShellObserver {
// Access the shelf widget associated with this root window controller,
// NULL if no such shelf exists.
+ // DEPRECATED: Prefer GetShelf()->shelf_widget().
ShelfWidget* shelf_widget() { return shelf_widget_.get(); }
// Get touch HUDs associated with this root window controller.
@@ -182,11 +184,15 @@ class ASH_EXPORT RootWindowController : public ShellObserver {
const aura::Window* GetContainer(int container_id) const;
// Show shelf view if it was created hidden (before session has started).
+ // TODO(jamescook): Eliminate this and handle show via Shelf.
void ShowShelf();
// Creates the shelf for this root window and notifies observers.
void CreateShelf();
+ // Returns the shelf controller for this root window.
+ Shelf* GetShelf() const;
+
// Called when the login status changes after login (such as lock/unlock).
// TODO(oshima): Investigate if we can merge this and |OnLoginStateChanged|.
void UpdateAfterLoginStatusChange(user::LoginStatus status);
« no previous file with comments | « ash/content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc ('k') | ash/root_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698