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

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/ash_switches.h"
 #include "ash/display/display_configuration_controller.h"
 #include "ash/shared/app_types.h"
 #include "ash/shell.h"
@@ skipping 270 matching lines @@
                                        chromeos::ACCELEROMETER_SOURCE_SCREEN)) {
     HandleScreenRotation(update->get(chromeos::ACCELEROMETER_SOURCE_SCREEN));
   }
 }
 
 void ScreenOrientationController::OnDisplayConfigurationChanged() {
   if (ignore_display_configuration_updates_)
     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() {
   // Do not exit early, as the internal display can be determined after Maximize
   // Mode has started. (chrome-os-partner:38796)
   // Always start observing.
   if (display::Display::HasInternalDisplay()) {
     current_rotation_ = user_rotation_ =
         ShellPort::Get()
             ->GetDisplayInfo(display::Display::InternalDisplayId())
@@ skipping 264 matching lines @@
 }
 
 bool ScreenOrientationController::CanRotateInLockedState() {
   return rotation_locked_orientation_ ==
              blink::kWebScreenOrientationLockLandscape ||
          rotation_locked_orientation_ ==
              blink::kWebScreenOrientationLockPortrait;
 }
 
 }  // namespace ash