Revert of Draggable peeking/fullscreen launcher with transparent background.

ash/shelf/shelf_layout_manager.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/shelf/shelf_layout_manager.h"
 
 #include <algorithm>
 #include <cmath>
 #include <vector>
 
@@ skipping 10 matching lines @@
 #include "ash/shell.h"
 #include "ash/shell_port.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/wm/fullscreen_window_finder.h"
 #include "ash/wm/mru_window_tracker.h"
 #include "ash/wm/screen_pinning_controller.h"
 #include "ash/wm/window_state.h"
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/i18n/rtl.h"
-#include "ui/app_list/app_list_features.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/events/event.h"
 #include "ui/events/event_handler.h"
 #include "ui/keyboard/keyboard_controller.h"
@@ skipping 377 matching lines @@
 }
 
 void ShelfLayoutManager::OnVirtualKeyboardStateChanged(
     bool activated,
     aura::Window* root_window) {
   UpdateKeyboardObserverFromStateChanged(
       activated, root_window, shelf_widget_->GetNativeWindow()->GetRootWindow(),
       &keyboard_observer_);
 }
 
-void ShelfLayoutManager::OnAppListVisibilityChanged(bool shown,
-                                                    aura::Window* root_window) {
-  if (shelf_ != Shelf::ForWindow(root_window))
-    return;
-
-  is_app_list_visible_ = shown;
-  if (app_list::features::IsFullscreenAppListEnabled())
-    MaybeUpdateShelfBackground(AnimationChangeType::IMMEDIATE);
-}
-
 void ShelfLayoutManager::OnWindowActivated(ActivationReason reason,
                                            aura::Window* gained_active,
                                            aura::Window* lost_active) {
   UpdateAutoHideStateNow();
 }
 
 void ShelfLayoutManager::OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) {
   bool keyboard_is_about_to_hide = false;
   if (new_bounds.IsEmpty() && !keyboard_bounds_.IsEmpty())
     keyboard_is_about_to_hide = true;
@@ skipping 23 matching lines @@
 }
 
 ShelfBackgroundType ShelfLayoutManager::GetShelfBackgroundType() const {
   if (state_.pre_lock_screen_animation_active)
     return SHELF_BACKGROUND_DEFAULT;
 
   // Handle all non active screen states, including OOBE and pre-login.
   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 (is_app_list_visible_ && app_list::features::IsFullscreenAppListEnabled())
-    return SHELF_BACKGROUND_DEFAULT;
-
   if (state_.visibility_state != SHELF_AUTO_HIDE &&
       state_.window_state == wm::WORKSPACE_WINDOW_STATE_MAXIMIZED) {
     return SHELF_BACKGROUND_MAXIMIZED;
   }
 
   if (gesture_drag_status_ == GESTURE_DRAG_IN_PROGRESS ||
       window_overlaps_shelf_ || state_.visibility_state == SHELF_AUTO_HIDE) {
     return SHELF_BACKGROUND_OVERLAP;
   }
 
@@ skipping 667 matching lines @@
       return gesture_drag_amount_ < 0;
     case SHELF_ALIGNMENT_LEFT:
       if (gesture_drag_auto_hide_state_ == SHELF_AUTO_HIDE_SHOWN)
         return gesture_drag_amount_ < 0;
       return gesture_drag_amount_ > 0;
   }
   return false;
 }
 
 }  // namespace ash