Move MaximizeModeWindowManager to the controller

ash/wm/maximize_mode/maximize_mode_controller.h

 // Copyright 2014 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_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_CONTROLLER_H_
 #define ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_CONTROLLER_H_
 
 #include "ash/accelerometer/accelerometer_observer.h"
 #include "ash/ash_export.h"
 #include "ash/display/display_manager.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/gfx/display.h"
 
 namespace ui {
 class EventHandler;
 }
 
 namespace ash {
 
 class MaximizeModeControllerTest;
 class MaximizeModeEventBlocker;
+class MaximizeModeWindowManager;
+class MaximizeModeWindowManagerTest;
 
 // MaximizeModeController listens to accelerometer events and automatically
 // enters and exits maximize mode when the lid is opened beyond the triggering
 // angle and rotates the display to match the device when in maximize mode.
 class ASH_EXPORT MaximizeModeController : public AccelerometerObserver {
  public:
   MaximizeModeController();
   virtual ~MaximizeModeController();
 
   bool in_set_screen_rotation() const {
@@ skipping 10 matching lines @@
   // change the display rotation.
   void set_rotation_locked(bool rotation_locked) {
     rotation_locked_ = rotation_locked;
   }
 
   // True if it is possible to enter maximize mode in the current
   // configuration. If this returns false, it should never be the case that
   // maximize mode becomes enabled.
   bool CanEnterMaximizeMode();
 
+  // TODO(jonross): Merge this with EnterMaximizeMode. Currently these are
+  // separate for several reasons: there is no internal display when running

[oshima, 2014/05/29 22:44:45]

You can enable internal display for test using

gfx::Display::SetInternalDisplayId.

Is it easy to fix now?

[jonross, 2014/05/30 14:37:50]

We found then also want to add that to where accelerators turn this on. So that
when using alt+ctrl+shift+8 to trigger this mode on linux it also works.

+  // unittests; the event blocker prevents keyboard input when running ChromeOS
+  // on linux. http://crbug.com/362881
+  // Turn the always maximize mode window manager on or off.
+  void EnableMaximizeModeWindowManager(bool enable);
+
+  // Test if the MaximizeModeWindowManager is enabled or not.
+  bool IsMaximizeModeWindowManagerEnabled() const;
+
+  // Shutdowns down the MaximizeModeWindowManager and notifies all observers.

[Mr4D (OOO till 08-26), 2014/05/29 22:15:24]

Could you add a note here towards why you do not combine this with the
destructor since it got paired at least in one location?

[jonross, 2014/05/30 14:37:50]

Done.

I'll upload on the next patch, once we decide on enabling the internal display
for tests/accelerator.

+  void Shutdown();
+
   // AccelerometerObserver:
   virtual void OnAccelerometerUpdated(const gfx::Vector3dF& base,
                                       const gfx::Vector3dF& lid) OVERRIDE;
 
  private:
   friend class MaximizeModeControllerTest;
+  friend class MaximizeModeWindowManagerTest;
 
   // Detect hinge rotation from |base| and |lid| accelerometers and
   // automatically start / stop maximize mode.
   void HandleHingeRotation(const gfx::Vector3dF& base,
                            const gfx::Vector3dF& lid);
 
   // Detect screen rotation from |lid| accelerometer and automatically rotate
   // screen.
   void HandleScreenRotation(const gfx::Vector3dF& lid);
 
   // Sets the display rotation and suppresses display notifications.
   void SetDisplayRotation(DisplayManager* display_manager,
                           gfx::Display::Rotation rotation);
 
   // Enables MaximizeModeWindowManager, and determines the current state of
   // rotation lock.
   void EnterMaximizeMode();
 
   // Removes MaximizeModeWindowManager and resets the display rotation if there
   // is no rotation lock.
   void LeaveMaximizeMode();
 
+  // The maximized window manager (if enabled).
+  scoped_ptr<MaximizeModeWindowManager> maximize_mode_window_manager_;
+
   // An event targeter controller which traps mouse and keyboard events while
   // maximize mode is engaged.
   scoped_ptr<MaximizeModeEventBlocker> event_blocker_;
 
   // An event handler used to detect screenshot actions while in maximize mode.
   scoped_ptr<ui::EventHandler> event_handler_;
 
   // When true calls to OnAccelerometerUpdated will not rotate the display.
   bool rotation_locked_;
 
   // Whether we have ever seen accelerometer data.
   bool have_seen_accelerometer_data_;
 
   // True when the screen's orientation is being changed.
   bool in_set_screen_rotation_;
 
   // The rotation of the display set by the user. This rotation will be
   // restored upon exiting maximize mode.
   gfx::Display::Rotation user_rotation_;
 
   DISALLOW_COPY_AND_ASSIGN(MaximizeModeController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_CONTROLLER_H_