| Index: ash/shelf/shelf_layout_manager.cc
|
| diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc
|
| index 5dc36f4344b3dfceddd570e0dbe5c9520f46566c..f0330e74e6ee775043983863c5e3292ba887bc27 100644
|
| --- a/ash/shelf/shelf_layout_manager.cc
|
| +++ b/ash/shelf/shelf_layout_manager.cc
|
| @@ -245,15 +245,13 @@ gfx::Rect ShelfLayoutManager::GetIdealBounds() {
|
| }
|
|
|
| void ShelfLayoutManager::LayoutShelf() {
|
| - if (shelf_->shelf()) {
|
| - TargetBounds target_bounds;
|
| - CalculateTargetBounds(state_, &target_bounds);
|
| - UpdateBoundsAndOpacity(target_bounds, false, NULL);
|
| + TargetBounds target_bounds;
|
| + CalculateTargetBounds(state_, &target_bounds);
|
| + UpdateBoundsAndOpacity(target_bounds, false, NULL);
|
|
|
| - // Update insets in ShelfWindowTargeter when shelf bounds change.
|
| - FOR_EACH_OBSERVER(ShelfLayoutManagerObserver, observers_,
|
| - WillChangeVisibilityState(visibility_state()));
|
| - }
|
| + // Update insets in ShelfWindowTargeter when shelf bounds change.
|
| + FOR_EACH_OBSERVER(ShelfLayoutManagerObserver, observers_,
|
| + WillChangeVisibilityState(visibility_state()));
|
| }
|
|
|
| ShelfVisibilityState ShelfLayoutManager::CalculateShelfVisibility() {
|
|
|