Aura: Remove overlapping window mode

ash/shell.h

 // 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.
 
 #ifndef ASH_SHELL_H_
 #define ASH_SHELL_H_
 #pragma once
 
 #include <utility>
 #include <vector>
@@ skipping 59 matching lines @@
 }
 
 // Shell is a singleton object that presents the Shell API and implements the
 // RootWindow's delegate interface.
 //
 // Upon creation, the Shell sets itself as the RootWindow's delegate, which
 // takes ownership of the Shell.
 class ASH_EXPORT Shell {
  public:
   // In compact window mode we fill the screen with a single maximized window,
-  // similar to ChromeOS R17 and earlier.  In overlapping mode we have draggable
-  // windows.  In managed mode the workspace arranges windows for the user.
+  // similar to ChromeOS R17 and earlier.  In managed mode we have overlapping
+  // windows arranged by the workspace.
   enum WindowMode {
     MODE_COMPACT,
     MODE_MANAGED,
-    MODE_OVERLAPPING,
   };
 
   enum BackgroundMode {
     BACKGROUND_IMAGE,
     BACKGROUND_SOLID_COLOR
   };
 
   enum Direction {
     FORWARD,
     BACKWARD
@@ skipping 118 matching lines @@
 
   static void set_initially_hide_cursor(bool hide) {
     initially_hide_cursor_ = hide;
   }
 
   // Made available for tests.
   internal::ShadowController* shadow_controller() {
     return shadow_controller_.get();
   }
 
-  static void set_compact_window_mode_for_test(bool compact) {
-    compact_window_mode_for_test_ = compact;
-  }
-
  private:
   FRIEND_TEST_ALL_PREFIXES(RootWindowEventFilterTest, MouseEventCursors);
   FRIEND_TEST_ALL_PREFIXES(RootWindowEventFilterTest, TransformActivate);
 
   typedef std::pair<aura::Window*, gfx::Rect> WindowAndBoundsPair;
 
   explicit Shell(ShellDelegate* delegate);
   virtual ~Shell();
 
   void Init();
 
-  // Returns the appropriate window mode to use based on the |command_line|
-  // and |compact_window_mode_for_test_|.
+  // Returns the appropriate window mode to use based on the |command_line|.
   WindowMode ComputeWindowMode(CommandLine* command_line) const;
 
   // Initializes or re-initializes the layout managers and event filters needed
   // to support a given window mode and cleans up the unneeded ones.
   void SetupCompactWindowMode();
-  void SetupNonCompactWindowMode();
+  void SetupManagedWindowMode();
 
   // Sets the LayoutManager of the container with the specified id to NULL. This
   // has the effect of deleting the current LayoutManager.
   void ResetLayoutManager(int container_id);
 
   // Disables the workspace grid layout.
   void DisableWorkspaceGridLayout();
 
   static Shell* instance_;
 
-  // Window mode is computed at shell initialization time, so allow it to be
-  // overridden without modifying the global command line.
-  static bool compact_window_mode_for_test_;
-
   // If set before the Shell is initialized, the mouse cursor will be hidden
   // when the screen is initially created.
   static bool initially_hide_cursor_;
 
   scoped_ptr<aura::RootWindow> root_window_;
 
   internal::RootWindowEventFilter* root_filter_;  // not owned
 
   std::vector<WindowAndBoundsPair> to_restore_;
 
@@ skipping 64 matching lines @@
   // Offset between the corner of the status area and the corner of the screen
   // when in the compact window mode.
   gfx::Size compact_status_area_offset_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_