Don't lock and save the orientation change made not through ScreenOrientationController

ash/display/screen_orientation_controller_chromeos.cc

Index: ash/display/screen_orientation_controller_chromeos.cc
diff --git a/ash/display/screen_orientation_controller_chromeos.cc b/ash/display/screen_orientation_controller_chromeos.cc
index 5c43768ff054d83f97c12614170cc68b94fa2ea5..e64e6123de8f4f89de9aacf443305693b544e5aa 100644
--- a/ash/display/screen_orientation_controller_chromeos.cc
+++ b/ash/display/screen_orientation_controller_chromeos.cc
@@ -288,20 +288,17 @@ void ScreenOrientationController::OnDisplayConfigurationChanged() {
     return;
   if (!display::Display::HasInternalDisplay())
     return;
-  display::Display::Rotation user_rotation =
+  if (!Shell::Get()->display_manager()->IsActiveDisplayId(
+          display::Display::InternalDisplayId())) {
+    return;
+  }
+
+  // TODO(oshima): We should disable the orientation change in settings
+  // because application may not work correctly.
+  current_rotation_ =
       ShellPort::Get()
           ->GetDisplayInfo(display::Display::InternalDisplayId())
           .GetActiveRotation();
-  if (user_rotation != current_rotation_) {
-    // TODO(oshima): We should disable the orientation change in settings
-    // because application may not work correctly.
-
-    // A user may change other display configuration settings. When the user
-    // does change the rotation setting, then lock rotation to prevent the
-    // accelerometer from erasing their change.
-    SetRotationLockedInternal(true);
-    user_rotation_ = current_rotation_ = user_rotation;
-  }
 }
 
 void ScreenOrientationController::OnMaximizeModeStarted() {