Move Screen Rotation from MaximizeModeController to ScreenOrientationController

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_controller.h"
-#include "ash/display/display_manager.h"
 #include "ash/shell_observer.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/observer_list.h"
 #include "ui/gfx/display.h"
 
 #if defined(OS_CHROMEOS)
+#include "ash/content/display/screen_orientation_delegate_chromeos.h"
 #include "chromeos/dbus/power_manager_client.h"
 #endif  // OS_CHROMEOS
 
 namespace base {
 class TickClock;
 }
 
 namespace ui {
 class EventHandler;
 }
 
 namespace ash {
 
 class MaximizeModeControllerTest;
 class ScopedDisableInternalMouseAndKeyboard;
 class MaximizeModeWindowManager;
 class MaximizeModeWindowManagerTest;
 namespace test {
 class MultiUserWindowManagerChromeOSTest;
 }
 
 // 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,
 #if defined(OS_CHROMEOS)
       public chromeos::PowerManagerClient::Observer,
+      public DisplayController::Observer,
 #endif  // OS_CHROMEOS
-      public ShellObserver,
-      public DisplayController::Observer {
+      public ShellObserver {
  public:
-  // Observer that reports changes to the state of MaximizeModeController's
-  // rotation lock.
-  class Observer {
-   public:
-    // Invoked whenever |rotation_locked_| is changed.
-    virtual void OnRotationLockChanged(bool rotation_locked) {}
-
-   protected:
-    virtual ~Observer() {}
-  };
-
   MaximizeModeController();
   ~MaximizeModeController() override;
 
-  bool ignore_display_configuration_updates() const {
-    return ignore_display_configuration_updates_;
-  }
-
-  // True if |rotation_lock_| has been set, and OnAccelerometerUpdated will not
-  // change the display rotation.
-  bool rotation_locked() {
-    return rotation_locked_;
-  }
-
-  // If |rotation_locked| future calls to OnAccelerometerUpdated will not
-  // change the display rotation.
-  void SetRotationLocked(bool rotation_locked);
-
-  // Sets the display rotation to |rotation| and prevents future calls to
-  // OnAccelerometerUpdated from changing the rotation. SetRotationLocked(false)
-  // removes the rotation lock.
-  void LockRotation(gfx::Display::Rotation rotation);
-
-  // Add/Remove observers.
-  void AddObserver(Observer* observer);
-  void RemoveObserver(Observer* observer);
-
   // 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
   // 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.
@@ skipping 16 matching lines @@
   void Shutdown();
 
   // AccelerometerObserver:
   void OnAccelerometerUpdated(const ui::AccelerometerUpdate& update) override;
 
   // ShellObserver:
   void OnAppTerminating() override;
   void OnMaximizeModeStarted() override;
   void OnMaximizeModeEnded() override;
 
+#if defined(OS_CHROMEOS)
   // DisplayController::Observer:
   void OnDisplayConfigurationChanged() override;
 
-#if defined(OS_CHROMEOS)
   // PowerManagerClient::Observer:
   virtual void LidEventReceived(bool open,
                                 const base::TimeTicks& time) override;
   virtual void SuspendImminent() override;
   virtual void SuspendDone(const base::TimeDelta& sleep_duration) override;
 #endif  // OS_CHROMEOS
 
  private:
   friend class MaximizeModeControllerTest;
   friend class MaximizeModeWindowManagerTest;
   friend class test::MultiUserWindowManagerChromeOSTest;
 
   // Set the TickClock. This is only to be used by tests that need to
   // artificially and deterministically control the current time.
   void SetTickClockForTest(scoped_ptr<base::TickClock> tick_clock);
 
   // 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);
-
   // Returns true if the lid was recently opened.
   bool WasLidOpenedRecently() const;
 
   // 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();
 
   // Record UMA stats tracking touchview usage.
   void RecordTouchViewStateTransition();
 
+#if defined(OS_CHROMEOS)
+  // 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(gfx::Display::Rotation rotation);
+
   // Checks DisplayManager for registered rotation lock, and rotation,
   // preferences. These are then applied.
   void LoadDisplayRotationProperties();
+#endif  // OS_CHROMEOS
 
   // The maximized window manager (if enabled).
   scoped_ptr<MaximizeModeWindowManager> maximize_mode_window_manager_;
 
   // A helper class which when instantiated will block native events from the
   // internal keyboard and touchpad.
   scoped_ptr<ScopedDisableInternalMouseAndKeyboard> event_blocker_;
 
-  // 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 changes being applied cause OnDisplayConfigurationChanged() to be
-  // called, and for which these changes should be ignored.
-  bool ignore_display_configuration_updates_;
-
   // True when the hinge angle has been detected past 180 degrees.
   bool lid_open_past_180_;
 
   // True when Shutdown has been called. When shutting down the non maximize
   // mode state should be restored, however user preferences should not be
   // altered.
   bool shutting_down_;
 
   // The rotation of the display set by the user. This rotation will be
   // restored upon exiting maximize mode.
   gfx::Display::Rotation user_rotation_;
 
   // The current rotation set by MaximizeModeController for the internal
   // display. Compared in OnDisplayConfigurationChanged to determine user
   // display setting changes.
   gfx::Display::Rotation current_rotation_;
 
-  // Rotation Lock observers.
-  ObserverList<Observer> observers_;
-
   // Tracks time spent in (and out of) touchview mode.
   base::Time last_touchview_transition_time_;
   base::TimeDelta total_touchview_time_;
   base::TimeDelta total_non_touchview_time_;
 
   // Tracks the last time we received a lid open event. This is used to suppress
   // erroneous accelerometer readings as the lid is opened but the accelerometer
   // reports readings that make the lid to appear near fully open.
   base::TimeTicks last_lid_open_time_;
 
   // Source for the current time in base::TimeTicks.
   scoped_ptr<base::TickClock> tick_clock_;
 
   // Tracks when the lid is closed. Used to prevent entering maximize mode.
   bool lid_is_closed_;
 
   DISALLOW_COPY_AND_ASSIGN(MaximizeModeController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_CONTROLLER_H_