CrOS Shelf: Overview is actually considered 'in-app'

Bug: 1009550
Change-Id: Ifb3ba316dfd1c6bbb48a9e3c3d2a7efec6d5a630
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1864609Reviewed-by: Matthew Mourgos <mmourgos@chromium.org>
Commit-Queue: Manu Cornet <manucornet@chromium.org>
Cr-Commit-Position: refs/heads/master@{#706532}

ash/public/cpp/shelf_config.h

@@ -8,7 +8,6 @@
 #include "ash/ash_export.h"
 #include "ash/public/cpp/app_list/app_list_controller_observer.h"
 #include "ash/public/cpp/tablet_mode_observer.h"
-#include "ash/wm/overview/overview_observer.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "base/observer_list_types.h"
@@ -21,7 +20,6 @@ namespace ash {
 // values could change at runtime.
 class ASH_EXPORT ShelfConfig : public TabletModeObserver,
                                public AppListControllerObserver,
-                               public OverviewObserver,
                                public display::DisplayObserver {
  public:
   class Observer : public base::CheckedObserver {
@@ -55,10 +53,6 @@ class ASH_EXPORT ShelfConfig : public TabletModeObserver,
   // AppListControllerObserver:
   void OnAppListVisibilityWillChange(bool shown, int64_t display_id) override;
 
-  // OverviewObserver:
-  void OnOverviewModeStartingAnimationComplete(bool canceled) override;
-  void OnOverviewModeEndingAnimationComplete(bool canceled) override;
-
   // Size of the shelf when visible (height when the shelf is horizontal and
   // width when the shelf is vertical).
   int shelf_size() const;

ash/shelf/shelf_config.cc

@@ -10,7 +10,6 @@
 #include "ash/shell.h"
 #include "ash/style/ash_color_provider.h"
 #include "ash/wallpaper/wallpaper_controller_impl.h"
-#include "ash/wm/overview/overview_controller.h"
 #include "ash/wm/tablet_mode/tablet_mode_controller.h"
 #include "chromeos/constants/chromeos_switches.h"
 #include "ui/gfx/color_analysis.h"
@@ -84,7 +83,6 @@ void ShelfConfig::Init() {
   Shell* shell = Shell::Get();
   shell->tablet_mode_controller()->AddObserver(this);
   shell->app_list_controller()->AddObserver(this);
-  shell->overview_controller()->AddObserver(this);
   display::Screen::GetScreen()->AddObserver(this);
 }
 
@@ -94,7 +92,6 @@ void ShelfConfig::Shutdown() {
 
   Shell* shell = Shell::Get();
   display::Screen::GetScreen()->RemoveObserver(this);
-  shell->overview_controller()->RemoveObserver(this);
   shell->app_list_controller()->RemoveObserver(this);
   shell->tablet_mode_controller()->RemoveObserver(this);
 }
@@ -122,14 +119,6 @@ void ShelfConfig::OnAppListVisibilityWillChange(bool shown,
   OnShelfConfigUpdated();
 }
 
-void ShelfConfig::OnOverviewModeStartingAnimationComplete(bool canceled) {
-  OnShelfConfigUpdated();
-}
-
-void ShelfConfig::OnOverviewModeEndingAnimationComplete(bool canceled) {
-  OnShelfConfigUpdated();
-}
-
 int ShelfConfig::shelf_size() const {
   // Before the hotseat redesign, the shelf always has the same size.
   if (!chromeos::switches::ShouldShowShelfHotseat())
@@ -204,13 +193,10 @@ int ShelfConfig::status_area_hit_region_padding() const {
 
 bool ShelfConfig::is_in_app() const {
   Shell* shell = Shell::Get();
-  const auto* overview = shell->overview_controller();
   const auto* session = shell->session_controller();
-  if (!overview || !session)
+  if (!session)
     return false;
-  return !overview->InOverviewSession() &&
-         !overview->IsCompletingShutdownAnimations() &&
-         session->GetSessionState() == session_manager::SessionState::ACTIVE &&
+  return session->GetSessionState() == session_manager::SessionState::ACTIVE &&
          !is_app_list_visible_;
 }
 

ash/shelf/shelf_config_unittest.cc

@@ -169,7 +169,7 @@ TEST_F(ShelfConfigTest, InAppMode) {
   // Now go into overview.
   OverviewController* overview_controller = Shell::Get()->overview_controller();
   overview_controller->StartOverview();
-  EXPECT_FALSE(ShelfConfig::Get()->is_in_app());
+  EXPECT_TRUE(ShelfConfig::Get()->is_in_app());
 
   // Back to the app.
   overview_controller->EndOverview();