diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-26 23:26:56 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-26 23:26:56 +0000 |
| commit | 09f3fc8feccea26a7544a73d7beb485a13949a13 (patch) | |
| tree | bdfddf4e4389f78c398965f74a78504af5e39667 /ash/wm/shelf_layout_manager.h | |
| parent | 3af863ac1a4a40cf7885858873cc549fac9e4f8a (diff) | |
| download | chromium_src-09f3fc8feccea26a7544a73d7beb485a13949a13.zip chromium_src-09f3fc8feccea26a7544a73d7beb485a13949a13.tar.gz chromium_src-09f3fc8feccea26a7544a73d7beb485a13949a13.tar.bz2 | |
Adds option to always hide launcher.
BUG=119803
TEST=see bug
R=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9863007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129045 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/shelf_layout_manager.h')
| -rw-r--r-- | ash/wm/shelf_layout_manager.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/ash/wm/shelf_layout_manager.h b/ash/wm/shelf_layout_manager.h index 05e3e7a..850aa80 100644 --- a/ash/wm/shelf_layout_manager.h +++ b/ash/wm/shelf_layout_manager.h @@ -8,6 +8,7 @@ #include "ash/ash_export.h" #include "ash/launcher/launcher.h" +#include "ash/wm/shelf_auto_hide_behavior.h" #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/timer.h" @@ -63,9 +64,11 @@ class ASH_EXPORT ShelfLayoutManager : public aura::LayoutManager { explicit ShelfLayoutManager(views::Widget* status); virtual ~ShelfLayoutManager(); - // Sets whether the shelf always auto-hides. Default is false. - void SetAlwaysAutoHide(bool value); - bool always_auto_hide() const { return always_auto_hide_; } + // Sets the ShelfAutoHideBehavior. See enum description for details. + void SetAutoHideBehavior(ShelfAutoHideBehavior behavior); + ShelfAutoHideBehavior auto_hide_behavior() const { + return auto_hide_behavior_; + } void set_workspace_manager(WorkspaceManager* manager) { workspace_manager_ = manager; @@ -174,7 +177,7 @@ class ASH_EXPORT ShelfLayoutManager : public aura::LayoutManager { bool in_layout_; // See description above setter. - bool always_auto_hide_; + ShelfAutoHideBehavior auto_hide_behavior_; // Current state. State state_; |