Aura: Remove overlapping window mode

ash/shell_unittest.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/ash_switches.h"
 #include "ash/launcher/launcher.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/root_window_layout_manager.h"
@@ skipping 283 matching lines @@
   CommandLine command_line_blank(CommandLine::NO_PROGRAM);
   EXPECT_EQ(Shell::MODE_MANAGED,
             test_api.ComputeWindowMode(&command_line_blank));
 
   // Sometimes we force compact mode.
   CommandLine command_line_force(CommandLine::NO_PROGRAM);
   command_line_force.AppendSwitch(switches::kAuraForceCompactWindowMode);
   EXPECT_EQ(Shell::MODE_COMPACT,
             test_api.ComputeWindowMode(&command_line_force));
 
-  // The user can set overlapping mode.
-  CommandLine command_line_overlapping(CommandLine::NO_PROGRAM);
-  command_line_overlapping.AppendSwitchASCII(
-      switches::kAuraWindowMode,
-      switches::kAuraWindowModeOverlapping);
-  EXPECT_EQ(Shell::MODE_OVERLAPPING,
-            test_api.ComputeWindowMode(&command_line_overlapping));
-
   // The user can set compact mode.
   CommandLine command_line_compact(CommandLine::NO_PROGRAM);
   command_line_compact.AppendSwitchASCII(switches::kAuraWindowMode,
                                          switches::kAuraWindowModeCompact);
   EXPECT_EQ(Shell::MODE_COMPACT,
             test_api.ComputeWindowMode(&command_line_compact));
 
   // The user can set managed.
   CommandLine command_line_managed(CommandLine::NO_PROGRAM);
   command_line_managed.AppendSwitchASCII(switches::kAuraWindowMode,
                                          switches::kAuraWindowModeManaged);
   EXPECT_EQ(Shell::MODE_MANAGED,
             test_api.ComputeWindowMode(&command_line_managed));
 }
 
 // Fails on Mac, see http://crbug.com/115662
 #if defined(OS_MACOSX)
-#define MAYBE_OverlappingWindowModeBasics FAILS_OverlappingWindowModeBasics
+#define MAYBE_ManagedWindowModeBasics FAILS_ManagedWindowModeBasics
 #else
-#define MAYBE_OverlappingWindowModeBasics OverlappingWindowModeBasics
+#define MAYBE_ManagedWindowModeBasics ManagedWindowModeBasics
 #endif
-TEST_F(ShellTest, MAYBE_OverlappingWindowModeBasics) {
+TEST_F(ShellTest, MAYBE_ManagedWindowModeBasics) {
   Shell* shell = Shell::GetInstance();
   Shell::TestApi test_api(shell);
 
   // We start with the usual window containers.
   ExpectAllContainers();
   // We're not in compact window mode by default.
   EXPECT_FALSE(shell->IsWindowModeCompact());
   // We have a default container event filter (for window drags).
   EXPECT_TRUE(GetDefaultContainer()->event_filter());
   // Launcher is visible.
@@ skipping 38 matching lines @@
   EXPECT_FALSE(Shell::GetInstance()->shelf()->visible());
 
   // Restoring the window restores it.
   widget->Restore();
   EXPECT_TRUE(Shell::GetInstance()->shelf()->visible());
 
   // Clean up.
   widget->Close();
 }
 
-// Window mode is computed at Shell initialization time.  Rather than changing
-// the global command line to select compact mode we set a switch before
-// initializing the shell.
+// By implementing GetOverrideWindowMode we make the Shell come up in compact
+// window mode.
 class ShellCompactWindowModeTest : public test::AshTestBase {
  public:
   ShellCompactWindowModeTest() {}
   virtual ~ShellCompactWindowModeTest() {}
 
-  virtual void SetUp() OVERRIDE {
-    // Must set this before base class initializes the shell.
-    Shell::set_compact_window_mode_for_test(true);
-    test::AshTestBase::SetUp();
-  }
-
-  virtual void TearDown() OVERRIDE {
-    test::AshTestBase::TearDown();
-    Shell::set_compact_window_mode_for_test(false);
+ protected:
+  virtual bool GetOverrideWindowMode(Shell::WindowMode* window_mode) {
+    *window_mode = Shell::MODE_COMPACT;
+    return true;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ShellCompactWindowModeTest);
 };
 
 TEST_F(ShellCompactWindowModeTest, CompactWindowModeBasics) {
   Shell* shell = Shell::GetInstance();
   Shell::TestApi test_api(shell);
 
@@ skipping 22 matching lines @@
   EXPECT_FALSE(launcher_widget->IsVisible());
   // Desktop background widget is gone but we have a layer.
   EXPECT_FALSE(test_api.root_window_layout()->background_widget());
   EXPECT_TRUE(test_api.root_window_layout()->background_layer());
 
   // Clean up.
   widget->Close();
 }
 
 }  // namespace ash