| Index: ash/shelf/shelf_layout_manager.cc
|
| diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc
|
| index 93788749a62681cf0fe7bea47b9cbc29f3f9f978..00e27b3589d80871f16fedb48f939c3fc0f4d994 100644
|
| --- a/ash/shelf/shelf_layout_manager.cc
|
| +++ b/ash/shelf/shelf_layout_manager.cc
|
| @@ -654,10 +654,6 @@ void ShelfLayoutManager::SetState(ShelfVisibilityState visibility_state) {
|
| UpdateShelfBackground(change_type);
|
| }
|
|
|
| - shelf_widget_->SetDimsShelf(state.visibility_state == SHELF_VISIBLE &&
|
| - state.window_state ==
|
| - wm::WORKSPACE_WINDOW_STATE_MAXIMIZED);
|
| -
|
| TargetBounds target_bounds;
|
| CalculateTargetBounds(state_, &target_bounds);
|
| UpdateBoundsAndOpacity(target_bounds, true, delay_background_change
|
| @@ -959,6 +955,9 @@ void ShelfLayoutManager::UpdateShelfBackground(
|
| }
|
|
|
| ShelfBackgroundType ShelfLayoutManager::GetShelfBackgroundType() const {
|
| + LOG(ERROR) << "MSW GetShelfBackgroundType " << shelf_widget_
|
| + << " vis:" << (state_.visibility_state != SHELF_AUTO_HIDE)
|
| + << " max:" << (state_.window_state == wm::WORKSPACE_WINDOW_STATE_MAXIMIZED);
|
| if (state_.visibility_state != SHELF_AUTO_HIDE &&
|
| state_.window_state == wm::WORKSPACE_WINDOW_STATE_MAXIMIZED) {
|
| return SHELF_BACKGROUND_MAXIMIZED;
|
|
|