Lock Rotation on user settings changes

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 "base/macros.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/observer_list.h"
 #include "ui/gfx/display.h"
 
 namespace ui {
 class EventHandler;
 }
 
 namespace ash {
 
 class MaximizeModeControllerTest;
 class MaximizeModeEventBlocker;
 
 // 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 {
+class ASH_EXPORT MaximizeModeController : public AccelerometerObserver,
+                                          public DisplayController::Observer {
  public:
+  // Observer that reports changes to the state of MaximizeModeController's
+  // rotation lock.
+  class ASH_EXPORT Observer {

[flackr, 2014/05/28 14:48:04]

I don't think ASH_EXPORT is necessary on a nested class.

[jonross, 2014/05/28 19:13:33]

Done.

+   public:
+    // Invoked whenever |rotation_locked_| is changed.
+    virtual void OnRotationLockChanged() {}

[flackr, 2014/05/28 14:48:04]

You could pass the new rotation lock state.

[jonross, 2014/05/28 19:13:33]

Done.

+
+   protected:
+    virtual ~Observer() {}
+  };
+
   MaximizeModeController();
   virtual ~MaximizeModeController();
 
   bool in_set_screen_rotation() const {
     return in_set_screen_rotation_;
   }
 
   // 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 set_rotation_locked(bool rotation_locked) {
-    rotation_locked_ = rotation_locked;
-  }
+  void SetRotationLocked(bool rotation_locked);
+
+  // 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();
 
   // AccelerometerObserver:
   virtual void OnAccelerometerUpdated(const gfx::Vector3dF& base,
                                       const gfx::Vector3dF& lid) OVERRIDE;
 
+  // DisplayController::Observer:
+  virtual void OnDisplayConfigurationChanged() OVERRIDE;
+
  private:
   friend class MaximizeModeControllerTest;
 
   // 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.
@@ skipping 24 matching lines @@
   // 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_;
 
+  // The current rotation set by MaximizdeModeController for the internal

[flackr, 2014/05/28 14:48:04]

s/MaxizdeModeController/MaximizeModeController

[jonross, 2014/05/28 19:13:33]

Done.

+  // display. Compared in OnDisplayConfigurationChanged to determine user
+  // display setting changes.
+  gfx::Display::Rotation current_rotation_;
+
+  // Rotation Lock observers.
+  ObserverList<Observer> observers_;
+
   DISALLOW_COPY_AND_ASSIGN(MaximizeModeController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_CONTROLLER_H_