diff options
| author | harrym@chromium.org <harrym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-21 21:29:08 +0000 |
|---|---|---|
| committer | harrym@chromium.org <harrym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-21 21:29:08 +0000 |
| commit | d05ac1a5b7f7449e3d3b69e5eb747d2b8b0fdad9 (patch) | |
| tree | 412dc2212f7d519bb6ea31b6f818c4c1cc1490c3 /ash/wm/shelf_layout_manager.cc | |
| parent | 3b1187b9988e8441c620c862f92ff49d5227f6e4 (diff) | |
| download | chromium_src-d05ac1a5b7f7449e3d3b69e5eb747d2b8b0fdad9.zip chromium_src-d05ac1a5b7f7449e3d3b69e5eb747d2b8b0fdad9.tar.gz chromium_src-d05ac1a5b7f7449e3d3b69e5eb747d2b8b0fdad9.tar.bz2 | |
Simplified Launcher Auto-Hide behavior, now has two behavior modes (always hide, never hide) defaulting to have the launcher always visible.
BUG=146773
Review URL: https://chromiumcodereview.appspot.com/10961006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158083 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/shelf_layout_manager.cc')
| -rw-r--r-- | ash/wm/shelf_layout_manager.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/ash/wm/shelf_layout_manager.cc b/ash/wm/shelf_layout_manager.cc index 399918a..1b765b3 100644 --- a/ash/wm/shelf_layout_manager.cc +++ b/ash/wm/shelf_layout_manager.cc @@ -162,7 +162,7 @@ class ShelfLayoutManager::UpdateShelfObserver ShelfLayoutManager::ShelfLayoutManager(views::Widget* status) : root_window_(Shell::GetPrimaryRootWindow()), in_layout_(false), - auto_hide_behavior_(SHELF_AUTO_HIDE_BEHAVIOR_DEFAULT), + auto_hide_behavior_(SHELF_AUTO_HIDE_BEHAVIOR_NEVER), alignment_(SHELF_ALIGNMENT_BOTTOM), launcher_(NULL), status_(status), @@ -284,8 +284,8 @@ void ShelfLayoutManager::UpdateVisibilityState() { break; case WORKSPACE_WINDOW_STATE_MAXIMIZED: - SetState(auto_hide_behavior_ != SHELF_AUTO_HIDE_BEHAVIOR_NEVER ? - AUTO_HIDE : VISIBLE); + SetState(auto_hide_behavior_ == SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS ? + AUTO_HIDE : VISIBLE); break; case WORKSPACE_WINDOW_STATE_WINDOW_OVERLAPS_SHELF: @@ -484,8 +484,7 @@ ShelfLayoutManager::TargetBounds::TargetBounds() : opacity(0.0f) {} gfx::Rect ShelfLayoutManager::GetMaximizedWindowBounds( aura::Window* window) { gfx::Rect bounds(ScreenAsh::GetDisplayBoundsInParent(window)); - if (auto_hide_behavior_ == SHELF_AUTO_HIDE_BEHAVIOR_DEFAULT || - auto_hide_behavior_ == SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS) { + if (auto_hide_behavior_ == SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS) { AdjustBoundsBasedOnAlignment(kAutoHideSize, &bounds); return bounds; } |