| Index: ash/wm/shelf_layout_manager.cc
|
| diff --git a/ash/wm/shelf_layout_manager.cc b/ash/wm/shelf_layout_manager.cc
|
| index f010bfcc56df895e3473372297db40bd9d055c3a..2d3abad9c4bb524dbf08a82cca94dac429af4d70 100644
|
| --- a/ash/wm/shelf_layout_manager.cc
|
| +++ b/ash/wm/shelf_layout_manager.cc
|
| @@ -129,9 +129,9 @@ void ShelfLayoutManager::SetAutoHideBehavior(ShelfAutoHideBehavior behavior) {
|
| }
|
|
|
| bool ShelfLayoutManager::IsVisible() const {
|
| - return state_.visibility_state == VISIBLE ||
|
| + return status_->IsVisible() && (state_.visibility_state == VISIBLE ||
|
| (state_.visibility_state == AUTO_HIDE &&
|
| - state_.auto_hide_state == AUTO_HIDE_SHOWN);
|
| + state_.auto_hide_state == AUTO_HIDE_SHOWN));
|
| }
|
|
|
| gfx::Rect ShelfLayoutManager::GetMaximizedWindowBounds(
|
|
|