Aura: Rework window mode flags to compact/overlapping/managed

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/aura_shell_test_base.h"
 #include "ash/wm/root_window_layout_manager.h"
@@ skipping 283 matching lines @@
 }
 
 TEST_F(ShellTest, ComputeWindowMode) {
   // We only change default window mode with full-screen host windows.
   AutoResetUseFullscreenHostWindow use_fullscreen_host_window(true);
 
   // Wide screens use normal window mode.
   Shell* shell = Shell::GetInstance();
   gfx::Size monitor_size(1440, 900);
   CommandLine command_line(CommandLine::NO_PROGRAM);
-  EXPECT_EQ(Shell::NORMAL_MODE,
+  EXPECT_EQ(Shell::MODE_OVERLAPPING,
             shell->ComputeWindowMode(monitor_size, &command_line));
 
   // Alex-sized screens need compact mode.
   monitor_size.SetSize(1280, 800);
-  EXPECT_EQ(Shell::COMPACT_MODE,
+  EXPECT_EQ(Shell::MODE_COMPACT,
             shell->ComputeWindowMode(monitor_size, &command_line));
 
   // ZGB-sized screens need compact mode.
   monitor_size.SetSize(1366, 768);
-  EXPECT_EQ(Shell::COMPACT_MODE,
+  EXPECT_EQ(Shell::MODE_COMPACT,
             shell->ComputeWindowMode(monitor_size, &command_line));
 
-  // Even for a small screen, the user can force normal mode.
+  // Even for a small screen, the user can force overlapping mode.
   monitor_size.SetSize(800, 600);
   command_line.AppendSwitchASCII(ash::switches::kAuraWindowMode,
-                                 ash::switches::kAuraWindowModeNormal);
-  EXPECT_EQ(Shell::NORMAL_MODE,
+                                 ash::switches::kAuraWindowModeOverlapping);
+  EXPECT_EQ(Shell::MODE_OVERLAPPING,
             shell->ComputeWindowMode(monitor_size, &command_line));
 
   // Even for a large screen, the user can force compact mode.
   monitor_size.SetSize(1920, 1080);
   CommandLine command_line2(CommandLine::NO_PROGRAM);
   command_line2.AppendSwitchASCII(ash::switches::kAuraWindowMode,
-                                 ash::switches::kAuraWindowModeCompact);
-  EXPECT_EQ(Shell::COMPACT_MODE,
+                                  ash::switches::kAuraWindowModeCompact);
+  EXPECT_EQ(Shell::MODE_COMPACT,
             shell->ComputeWindowMode(monitor_size, &command_line2));
 }
 
 TEST_F(ShellTest, ChangeWindowMode) {
   // We start with the usual window containers.
   ExpectAllContainers();
   // We're not in compact window mode by default.
   Shell* shell = Shell::GetInstance();
   EXPECT_FALSE(shell->IsWindowModeCompact());
   // We have a default container event filter (for window drags).
   EXPECT_TRUE(GetDefaultContainer()->event_filter());
   // We have a launcher.
   EXPECT_TRUE(shell->launcher()->widget()->IsVisible());
   // We have a desktop background.
   EXPECT_TRUE(shell->root_window_layout_->background_widget());
 
   // Create a normal window.  It is not maximized.
   views::Widget::InitParams widget_params(
       views::Widget::InitParams::TYPE_WINDOW);
   widget_params.bounds.SetRect(11, 22, 300, 400);
   views::Widget* widget = CreateTestWindow(widget_params);
   widget->Show();
   EXPECT_FALSE(widget->IsMaximized());
 
   // Set our new mode.
-  shell->ChangeWindowMode(Shell::COMPACT_MODE);
+  shell->ChangeWindowMode(Shell::MODE_COMPACT);
   EXPECT_TRUE(shell->IsWindowModeCompact());
   // Compact mode does not use a default container event filter.
   EXPECT_FALSE(GetDefaultContainer()->event_filter());
   // We still have all the usual containers.
   ExpectAllContainers();
 
   // In compact window mode, all windows are maximized.
   EXPECT_TRUE(widget->IsMaximized());
   // Window bounds got updated to fill the work area.
   EXPECT_EQ(widget->GetWorkAreaBoundsInScreen(),
             widget->GetWindowScreenBounds());
   // Launcher is hidden.
   EXPECT_FALSE(shell->launcher()->widget()->IsVisible());
   // Desktop background is gone.
   EXPECT_FALSE(shell->root_window_layout_->background_widget());
 
-  // Switch back to normal mode.
-  shell->ChangeWindowMode(Shell::NORMAL_MODE);
+  // Switch back to overlapping mode.
+  shell->ChangeWindowMode(Shell::MODE_OVERLAPPING);
   EXPECT_FALSE(shell->IsWindowModeCompact());
   // Event filter came back.
   EXPECT_TRUE(GetDefaultContainer()->event_filter());
   // Launcher is visible again.
   EXPECT_TRUE(shell->launcher()->widget()->IsVisible());
   // Desktop background is back.
   EXPECT_TRUE(shell->root_window_layout_->background_widget());
 
   // Clean up.
   widget->Close();
 }
 
 }  // namespace ash