| Index: ash/shelf/shelf_layout_manager.cc
|
| diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc
|
| index b4a731173fac93302527c6202bd07770382f007c..f1c1c0390da87353cb1beff601806d156431a478 100644
|
| --- a/ash/shelf/shelf_layout_manager.cc
|
| +++ b/ash/shelf/shelf_layout_manager.cc
|
| @@ -176,6 +176,11 @@ ShelfLayoutManager::~ShelfLayoutManager() {
|
| ShellPort::Get()->RemoveLockStateObserver(this);
|
| }
|
|
|
| +void ShelfLayoutManager::AppListIsActive(bool active) {
|
| + app_list_is_active_ = active;
|
| + MaybeUpdateShelfBackground(AnimationChangeType::IMMEDIATE);
|
| +}
|
| +
|
| void ShelfLayoutManager::PrepareForShutdown() {
|
| in_shutdown_ = true;
|
| // Stop observing changes to avoid updating a partially destructed shelf.
|
| @@ -470,6 +475,10 @@ ShelfBackgroundType ShelfLayoutManager::GetShelfBackgroundType() const {
|
| if (state_.session_state != session_manager::SessionState::ACTIVE)
|
| return SHELF_BACKGROUND_OVERLAP;
|
|
|
| + // If the app list is active, hide the shelf background to prevent overlap.
|
| + if (app_list_is_active_)
|
| + return SHELF_BACKGROUND_DEFAULT;
|
| +
|
| if (state_.visibility_state != SHELF_AUTO_HIDE &&
|
| state_.window_state == wm::WORKSPACE_WINDOW_STATE_MAXIMIZED) {
|
| return SHELF_BACKGROUND_MAXIMIZED;
|
|
|