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..183f17403d6539a2cad52698c7f2170e8125dbba 100644 |
--- a/ash/wm/shelf_layout_manager.cc |
+++ b/ash/wm/shelf_layout_manager.cc |
@@ -129,9 +129,12 @@ void ShelfLayoutManager::SetAutoHideBehavior(ShelfAutoHideBehavior behavior) { |
} |
bool ShelfLayoutManager::IsVisible() const { |
- return state_.visibility_state == VISIBLE || |
+ bool empty = status_->GetWindowScreenBounds().IsEmpty() && |
sky
2012/04/09 21:01:48
Can we use status_->IsVisible() instead? Also, I t
sadrul
2012/04/09 23:59:34
Changed to use status_->IsVisible. I have removed
|
+ (launcher_widget()->GetWindowScreenBounds().IsEmpty() || |
+ launcher_->GetStatusWidth() == 0); |
+ return !empty && (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( |