Resolve current orientation after applying the previous orientation request.

ash/display/screen_orientation_controller_chromeos.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_DISPLAY_SCREEN_ORIENTATION_CONTROLLER_CHROMEOS_H_
 #define ASH_DISPLAY_SCREEN_ORIENTATION_CONTROLLER_CHROMEOS_H_
 
-#include <map>
+#include <unordered_map>
 
 #include "ash/ash_export.h"
 #include "ash/common/shell_observer.h"
 #include "ash/common/wm_activation_observer.h"
 #include "ash/common/wm_display_observer.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "chromeos/accelerometer/accelerometer_reader.h"
 #include "chromeos/accelerometer/accelerometer_types.h"
 #include "third_party/WebKit/public/platform/modules/screen_orientation/WebScreenOrientationLockType.h"
@@ skipping 17 matching lines @@
   // rotation lock.
   class Observer {
    public:
     // Invoked when rotation is locked or unlocked by a user.
     virtual void OnUserRotationLockChanged() {}
 
    protected:
     virtual ~Observer() {}
   };
 
+  // Controls the behavior after lock is applied to the window (when
+  // the window becomes active window). |DisableSensor| disables
+  // the sensor based rotation and locks to the specific orientation.
+  // For example, PORTRAIT may rotate to PORTRAIT_PRIMARY or
+  // PORTRAIT_SECONDARY, and will allow rotate between these two.
+  // |DisableSensor| will lock the orientation to the one of them
+  // after locked to disalow the sensor basd rotation.
+  enum class LockCompletionBehavior {
+    None,
+    DisableSensor,
+  };
+
   ScreenOrientationController();
   ~ScreenOrientationController() override;
 
   // Add/Remove observers.
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
   // Allows/unallows a window to lock the screen orientation.
   void LockOrientationForWindow(
       WmWindow* requesting_window,
-      blink::WebScreenOrientationLockType lock_orientation);
+      blink::WebScreenOrientationLockType lock_orientation,
+      LockCompletionBehavior lock_completion_behavior);
   void UnlockOrientationForWindow(WmWindow* window);
 
   // Unlock all and set the rotation back to the user specified rotation.
   void UnlockAll();
 
   bool ScreenOrientationProviderSupported() const;
 
   bool ignore_display_configuration_updates() const {
     return ignore_display_configuration_updates_;
   }
@@ skipping 30 matching lines @@
   // WmDisplayObserver:
   void OnDisplayConfigurationChanged() override;
 
   // ShellObserver:
   void OnMaximizeModeStarted() override;
   void OnMaximizeModeEnded() override;
 
  private:
   friend class test::ScreenOrientationControllerTestApi;
 
+  struct LockInfo {
+    LockInfo() {}
+    LockInfo(blink::WebScreenOrientationLockType orientation,
+             LockCompletionBehavior lock_completion_behavior)
+        : orientation(orientation),
+          lock_completion_behavior(lock_completion_behavior) {}
+
+    blink::WebScreenOrientationLockType orientation =
+        blink::WebScreenOrientationLockAny;
+    LockCompletionBehavior lock_completion_behavior =
+        LockCompletionBehavior::None;
+  };
+
   // Sets the display rotation for the given |source|. The new |rotation| will
   // also become active. Display changed notifications are surpressed for this
   // change.
   void SetDisplayRotation(display::Display::Rotation rotation,
                           display::Display::RotationSource source);
 
   void SetRotationLockedInternal(bool rotation_locked);
 
   // A helper method that set locked to the given |orientation| and save it.
   void SetLockToOrientation(blink::WebScreenOrientationLockType orientation);
@@ skipping 38 matching lines @@
   // window, and applies it. If there is none, rotation lock will be removed.
   void ApplyLockForActiveWindow();
 
   // Both |blink::WebScreenOrientationLockLandscape| and
   // |blink::WebScreenOrientationLockPortrait| allow for rotation between the
   // two angles of the same screen orientation
   // (http://www.w3.org/TR/screen-orientation/). Returns true if |rotation| is
   // supported for the current |rotation_locked_orientation_|.
   bool IsRotationAllowedInLockedState(display::Display::Rotation rotation);
 
+  blink::WebScreenOrientationLockType GetCurrentOrientationForTest() const;
+
   // Certain orientation locks allow for rotation between the two angles of the
   // same screen orientation. Returns true if |rotation_locked_orientation_|
   // allows rotation.
   bool CanRotateInLockedState();
 
   // The orientation of the display when at a rotation of 0.
   blink::WebScreenOrientationLockType natural_orientation_;
 
   // True when changes being applied cause OnDisplayConfigurationChanged() to be
   // called, and for which these changes should be ignored.
@@ skipping 15 matching lines @@
 
   // The current rotation set by ScreenOrientationController for the internal
   // display.
   display::Display::Rotation current_rotation_;
 
   // Rotation Lock observers.
   base::ObserverList<Observer> observers_;
 
   // Tracks all windows that have requested a lock, as well as the requested
   // orientation.
-  std::map<WmWindow*, blink::WebScreenOrientationLockType> locking_windows_;
+  std::unordered_map<WmWindow*, LockInfo> lock_info_map_;
 
   DISALLOW_COPY_AND_ASSIGN(ScreenOrientationController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_DISPLAY_SCREEN_ORIENTATION_CONTROLLER_CHROMEOS_H_