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 214 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);
   }
-  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_));
+  SetLockToOrientation(user_locked_orientation_);
+}
 
-  ApplyLockForActiveWindow();
-  for (auto& observer : observers_)
-    observer.OnUserRotationLockChanged();
+void ScreenOrientationController::SetLockToRotation(
+    display::Display::Rotation rotation) {
+  user_locked_orientation_ = RotationToOrientation(rotation);
+  SetLockToOrientation(user_locked_orientation_);
 }
 
 void ScreenOrientationController::OnWindowActivated(ActivationReason reason,
                                                     aura::Window* gained_active,
                                                     aura::Window* lost_active) {
   ApplyLockForActiveWindow();
 }
 
 void ScreenOrientationController::OnWindowDestroying(aura::Window* window) {
   UnlockOrientationForWindow(WmWindow::Get(window));
@@ skipping 97 matching lines @@
 
 void ScreenOrientationController::SetRotationLockedInternal(
     bool rotation_locked) {
   if (rotation_locked_ == rotation_locked)
     return;
   rotation_locked_ = rotation_locked;
   if (!rotation_locked_)
     rotation_locked_orientation_ = blink::WebScreenOrientationLockAny;
 }
 
+void ScreenOrientationController::SetLockToOrientation(
+    blink::WebScreenOrientationLockType orientation) {

[oshima, 2017/03/30 04:46:00]

this should be either

SetLockToOrientation(orientation) {
user_locked_orientation_ = orientation;

....


or

SetLockToUserLockedOrientation() {
}

whichever you like.

+  if (!display::Display::HasInternalDisplay())
+    return;

[oshima, 2017/03/30 04:46:00]

you need to do this in SetLockToRotation if you update the state there.

+
+  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();
+}
+
 void ScreenOrientationController::LockRotation(
     display::Display::Rotation rotation,
     display::Display::RotationSource source) {
   SetRotationLockedInternal(true);
   SetDisplayRotation(rotation, source);
 }
 
 void ScreenOrientationController::LockRotationToOrientation(
     blink::WebScreenOrientationLockType lock_orientation) {
   rotation_locked_orientation_ = lock_orientation;
@@ skipping 182 matching lines @@
 }
 
 bool ScreenOrientationController::CanRotateInLockedState() {
   return rotation_locked_orientation_ ==
              blink::WebScreenOrientationLockLandscape ||
          rotation_locked_orientation_ ==
              blink::WebScreenOrientationLockPortrait;
 }
 
 }  // namespace ash