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

Unified Diff: ash/shelf/shelf.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/root_window_controller.cc ('k') | ash/shelf/shelf.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf.h
diff --git a/ash/shelf/shelf.h b/ash/shelf/shelf.h
index ff3ee4a461eca8462ea051191beff47264a21626..50c80ba3fbb1b9e0f1a729889fb8c00c6658bdf5 100644
--- a/ash/shelf/shelf.h
+++ b/ash/shelf/shelf.h
@@ -47,6 +47,8 @@ namespace test {
class ShelfTestAPI;
}
+// Controller for shelf state. All access to state (visibility, auto-hide, etc.)
+// should occur via this class.
class ASH_EXPORT Shelf {
public:
static const char kNativeViewName[];
@@ -55,6 +57,8 @@ class ASH_EXPORT Shelf {
virtual ~Shelf();
// Return the shelf for the primary display. NULL if no user is logged in yet.
+ // Useful for tests. For production code use ForWindow() because the user may
+ // have multiple displays.
static Shelf* ForPrimaryDisplay();
// Return the shelf for the display that |window| is currently on, or a shelf
@@ -72,9 +76,6 @@ class ASH_EXPORT Shelf {
return auto_hide_behavior_;
}
- // TODO(msw): Remove this accessor, kept temporarily to simplify changes.
- ShelfAutoHideBehavior GetAutoHideBehavior() const;
-
// A helper functions that chooses values specific to a shelf alignment.
template <typename T>
T SelectValueForShelfAlignment(T bottom, T left, T right) const {
« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/shelf/shelf.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698