cros: Treat set rotation for chrome.system.display API in touchview mode as if user rotation lock

ash/display/screen_orientation_controller_chromeos.cc

 // 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.
 
 #include "ash/display/screen_orientation_controller_chromeos.h"
 
 #include "ash/common/ash_switches.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/common/wm/mru_window_tracker.h"
 #include "ash/common/wm/window_state.h"
@@ skipping 44 matching lines @@
     case display::Display::ROTATE_90:
     case display::Display::ROTATE_270:
       return size.height() < size.width()
                  ? blink::WebScreenOrientationLockPortrait
                  : blink::WebScreenOrientationLockLandscape;
   }
   NOTREACHED();
   return blink::WebScreenOrientationLockLandscape;
 }
 
-blink::WebScreenOrientationLockType RotationToOrientation(
-    display::Display::Rotation rotation) {
-  blink::WebScreenOrientationLockType natural = GetDisplayNaturalOrientation();
-  if (natural == blink::WebScreenOrientationLockLandscape) {
-    switch (rotation) {
-      case display::Display::ROTATE_0:
-        return blink::WebScreenOrientationLockLandscapePrimary;
-      case display::Display::ROTATE_90:
-        return blink::WebScreenOrientationLockPortraitPrimary;
-      case display::Display::ROTATE_180:
-        return blink::WebScreenOrientationLockLandscapeSecondary;
-      case display::Display::ROTATE_270:
-        return blink::WebScreenOrientationLockPortraitSecondary;
-    }
-  } else {  // Natural portrait
-    switch (rotation) {
-      case display::Display::ROTATE_0:
-        return blink::WebScreenOrientationLockPortraitPrimary;
-      case display::Display::ROTATE_90:
-        return blink::WebScreenOrientationLockLandscapePrimary;
-      case display::Display::ROTATE_180:
-        return blink::WebScreenOrientationLockPortraitSecondary;
-      case display::Display::ROTATE_270:
-        return blink::WebScreenOrientationLockLandscapeSecondary;
-    }
-  }
-  NOTREACHED();
-  return blink::WebScreenOrientationLockAny;
-}
-
 // Returns the rotation that matches the orientation type.
 // Returns ROTATE_0 if the given orientation is ANY, which is used
 // to indicate that user didn't lock orientation.
 display::Display::Rotation OrientationToRotation(
     blink::WebScreenOrientationLockType orientation) {
   blink::WebScreenOrientationLockType natural = GetDisplayNaturalOrientation();
   if (orientation == blink::WebScreenOrientationLockAny) {
     return display::Display::ROTATE_0;
   }
 
@@ skipping 41 matching lines @@
       (app_requested == blink::WebScreenOrientationLockPortrait &&
        (lock == blink::WebScreenOrientationLockPortraitPrimary ||
         lock == blink::WebScreenOrientationLockPortraitSecondary))) {
     return lock;
   }
   return app_requested;
 }
 
 }  // namespace
 
+// static
+blink::WebScreenOrientationLockType
+ScreenOrientationController::RotationToOrientation(
+    display::Display::Rotation rotation) {
+  blink::WebScreenOrientationLockType natural = GetDisplayNaturalOrientation();
+  if (natural == blink::WebScreenOrientationLockLandscape) {
+    switch (rotation) {
+      case display::Display::ROTATE_0:
+        return blink::WebScreenOrientationLockLandscapePrimary;
+      case display::Display::ROTATE_90:
+        return blink::WebScreenOrientationLockPortraitPrimary;
+      case display::Display::ROTATE_180:
+        return blink::WebScreenOrientationLockLandscapeSecondary;
+      case display::Display::ROTATE_270:
+        return blink::WebScreenOrientationLockPortraitSecondary;
+    }
+  } else {  // Natural portrait
+    switch (rotation) {
+      case display::Display::ROTATE_0:
+        return blink::WebScreenOrientationLockPortraitPrimary;
+      case display::Display::ROTATE_90:
+        return blink::WebScreenOrientationLockLandscapePrimary;
+      case display::Display::ROTATE_180:
+        return blink::WebScreenOrientationLockPortraitSecondary;
+      case display::Display::ROTATE_270:
+        return blink::WebScreenOrientationLockLandscapeSecondary;
+    }
+  }
+  NOTREACHED();
+  return blink::WebScreenOrientationLockAny;
+}
+
 ScreenOrientationController::ScreenOrientationController()
     : natural_orientation_(GetDisplayNaturalOrientation()),
       ignore_display_configuration_updates_(false),
       rotation_locked_(false),
       rotation_locked_orientation_(blink::WebScreenOrientationLockAny),
       user_rotation_(display::Display::ROTATE_0),
       current_rotation_(display::Display::ROTATE_0) {
   Shell::GetInstance()->AddShellObserver(this);
 }
 
@@ skipping 59 matching lines @@
 
   if (user_rotation_locked()) {
     user_locked_orientation_ = blink::WebScreenOrientationLockAny;
   } else {
     display::Display::Rotation current_rotation =
         WmShell::Get()
             ->GetDisplayInfo(display::Display::InternalDisplayId())
             .GetActiveRotation();
     user_locked_orientation_ = RotationToOrientation(current_rotation);
   }
+  SetLockToOrientation(user_locked_orientation_);
+}
+
+void ScreenOrientationController::SetLockToOrientation(
+    blink::WebScreenOrientationLockType orientation) {
+  DCHECK(display::Display::HasInternalDisplay());

[oshima, 2017/03/30 00:44:37]

move SetLockToOrientation to private, and add
SetLockToRotation.

return if it doesn't have internal display like other API.

[Qiang(Joe) Xu, 2017/03/30 01:15:14]

Done.

+  user_locked_orientation_ = orientation;
   base::AutoReset<bool> auto_ignore_display_configuration_updates(
       &ignore_display_configuration_updates_, true);
   Shell::GetInstance()->display_manager()->RegisterDisplayRotationProperties(
       user_rotation_locked(), OrientationToRotation(user_locked_orientation_));
 
   ApplyLockForActiveWindow();
   for (auto& observer : observers_)
     observer.OnUserRotationLockChanged();
 }
 
@@ skipping 307 matching lines @@
 }
 
 bool ScreenOrientationController::CanRotateInLockedState() {
   return rotation_locked_orientation_ ==
              blink::WebScreenOrientationLockLandscape ||
          rotation_locked_orientation_ ==
              blink::WebScreenOrientationLockPortrait;
 }
 
 }  // namespace ash