Ash: Remove compact 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 58 matching lines @@
 class WorkspaceController;
 }
 
 // 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 managed mode we have overlapping
-  // windows arranged by the workspace.
-  enum WindowMode {
-    MODE_COMPACT,
-    MODE_MANAGED,
-  };
-
   enum BackgroundMode {
     BACKGROUND_IMAGE,
     BACKGROUND_SOLID_COLOR
   };
 
   enum Direction {
     FORWARD,
     BACKWARD
   };
 
   // Accesses private data from a Shell for testing.
   class ASH_EXPORT TestApi {
    public:
     explicit TestApi(Shell* shell);
 
-    WindowMode ComputeWindowMode(CommandLine* cmd) const;
     internal::RootWindowLayoutManager* root_window_layout();
     internal::InputMethodEventFilter* input_method_event_filter();
     internal::WorkspaceController* workspace_controller();
 
    private:
     Shell* shell_;  // not owned
 
     DISALLOW_COPY_AND_ASSIGN(TestApi);
   };
 
   // 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();
 
   // Returns true if the ash shell has been instantiated.
   static bool HasInstance();
 
   static void DeleteInstance();
 
   // Get the singleton RootWindow used by the Shell.
   static aura::RootWindow* GetRootWindow();
 
-  const gfx::Size& compact_status_area_offset() const {
-    return compact_status_area_offset_;
-  }
-
   BackgroundMode desktop_background_mode() const {
     return desktop_background_mode_;
   }
 
   aura::Window* GetContainer(int container_id);
   const aura::Window* GetContainer(int container_id) const;
 
   // Adds or removes |filter| from the RootWindowEventFilter.
   void AddRootWindowEventFilter(aura::EventFilter* filter);
   void RemoveRootWindowEventFilter(aura::EventFilter* filter);
   size_t GetRootWindowEventFilterCount() const;
 
   // Shows the background menu over |widget|.
   void ShowBackgroundMenu(views::Widget* widget, const gfx::Point& location);
 
   // Toggles app list.
   void ToggleAppList();
 
   // Sets the desktop background mode.
   void SetDesktopBackgroundMode(BackgroundMode 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_ == MODE_COMPACT; }
-
-  // Sets the offset between the corner of the status area and the corner of the
-  // screen when we're using the compact window mode.
-  void SetCompactStatusAreaOffset(gfx::Size& offset);
-
   // Creates a default views::NonClientFrameView for use by windows in the
   // Ash environment.
   views::NonClientFrameView* CreateDefaultNonClientFrameView(
       views::Widget* widget);
 
-  // Rotate focus through containers that can recieve focus.
+  // Rotate focus through containers that can receive focus.
   void RotateFocus(Direction direction);
 
 #if !defined(OS_MACOSX)
   AcceleratorController* accelerator_controller() {
     return accelerator_controller_.get();
   }
 #endif  // !defined(OS_MACOSX)
 
   internal::RootWindowEventFilter* root_filter() {
     return root_filter_;
@@ skipping 48 matching lines @@
   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|.
-  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 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);
+  // Initializes the layout managers and event filters.
+  void InitLayoutManagers();
 
   // Disables the workspace grid layout.
   void DisableWorkspaceGridLayout();
 
   static Shell* instance_;
 
   // If set before the Shell is initialized, the mouse cursor will be hidden
   // when the screen is initially created.
   static bool initially_hide_cursor_;
 
@@ skipping 44 matching lines @@
 #if !defined(OS_MACOSX)
   // An event filter that pre-handles global accelerators.
   scoped_ptr<internal::AcceleratorFilter> accelerator_filter_;
 #endif
 
   // The shelf for managing the launcher and the status widget in non-compact
   // mode. Shell does not own the shelf. Instead, it is owned by container of
   // the status area.
   internal::ShelfLayoutManager* shelf_;
 
-  // Does not change after Init().
-  WindowMode window_mode_;
-
   // Can change at runtime.
   BackgroundMode desktop_background_mode_;
 
   // Owned by aura::RootWindow, cached here for type safety.
   internal::RootWindowLayoutManager* root_window_layout_;
 
   // Status area with clock, Wi-Fi signal, etc.
   views::Widget* status_widget_;
 
   // System tray with clock, Wi-Fi signal, etc. (a replacement in progress for
   // |status_widget_|).
   scoped_ptr<SystemTray> tray_;
 
-  // 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_