Lock rotation when screen is manually rotated.

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 "base/macros.h"
 #include "base/memory/scoped_ptr.h"
+#include "ui/gfx/display.h"
 
 namespace ui {
 class EventHandler;
 }
 
 namespace ash {
 
 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 {
  public:
   MaximizeModeController();
   virtual ~MaximizeModeController();
 
+  // True if OnAccelerometerUpdated has led to a call to
+  // DisplayManager::SetDisplayRotation. If true display configuration changes
+  // should not be saved to user preferences.
+  bool accelerometer_setting_rotation() {

[oshima, 2014/05/22 17:14:29]

vconst

+    return accelerometer_setting_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;
@@ skipping 11 matching lines @@
  private:
   // 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);
 
+  // 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();
+
   // 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_;
 
+  // True when OnAccelerometerUpdated leads to changes to the display rotation.
+  bool accelerometer_setting_rotation_;

[oshima, 2014/05/22 17:14:29]

optional: how about is_rotated_by_accelerometer? (please ignore if you think
your is better)

[jonross, 2014/05/23 19:07:20]

No longer necessary. A lock around rotation has been added in parallel.
Switching to use that.

+
   // 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_;
 
+  // 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_