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

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 47 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 normal mode we have draggable
-  // windows.
+  // similar to ChromeOS R17 and earlier.  In overlapping mode we have draggable
+  // windows.  In managed mode the workspace arranges windows for the user.
   enum WindowMode {
-    NORMAL_MODE,
-    COMPACT_MODE
+    MODE_UNINITIALIZED = -1,

[sky, 2012/01/31 21:44:54]

Do we really need MODE_UNINITIALIZED?

[James Cook, 2012/01/31 22:26:28]

Not really.  Removed.

+    MODE_COMPACT,
+    MODE_MANAGED,
+    MODE_OVERLAPPING,
   };
 
   // A shell must be explicitly created so that it can call |Init()| with the
   // delegate set. |delegate| can be NULL (if not required for initialization).
   static Shell* CreateInstance(ShellDelegate* delegate);
 
   // Should never be called before |CreateInstance()|.
   static Shell* GetInstance();
 
   static void DeleteInstance();
@@ skipping 17 matching lines @@
   // installed or removed.
   void ChangeWindowMode(WindowMode mode);
 
   // Returns true if the screen is locked.
   bool IsScreenLocked() const;
 
   // Returns true if a modal dialog window is currently open.
   bool IsModalWindowOpen() const;
 
   // See enum WindowMode for details.
-  bool IsWindowModeCompact() const { return window_mode_ == COMPACT_MODE; }
+  bool IsWindowModeCompact() const;
 
   // Creates a default views::NonClientFrameView for use by windows in the
   // Ash environment.
   views::NonClientFrameView* CreateDefaultNonClientFrameView(
       views::Widget* widget);
 
   AcceleratorController* accelerator_controller() {
     return accelerator_controller_.get();
   }
   internal::TooltipController* tooltip_controller() {
@@ skipping 30 matching lines @@
   void Init();
 
   // Returns the appropriate window mode to use based on the primary monitor's
   // |monitor_size| and the user's |command_line|.
   WindowMode ComputeWindowMode(const gfx::Size& monitor_size,
                                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 SetupNormalWindowMode();
+  void SetupNonCompactWindowMode(bool managed);
 
   // 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);
 
   static Shell* instance_;
 
   std::vector<WindowAndBoundsPair> to_restore_;
 
   base::WeakPtrFactory<Shell> method_factory_;
@@ skipping 31 matching lines @@
 
   // Status area with clock, Wi-Fi signal, etc.
   views::Widget* status_widget_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_