Revert of [Merge to M58] cros: Treat set rotation for chrome.system.display API in touchview mode as if user …

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 "ash/ash_export.h"
@@ skipping 61 matching lines @@
   bool user_rotation_locked() const {
     return user_locked_orientation_ != blink::WebScreenOrientationLockAny;
   }
 
   // Trun on/off the user rotation lock. When turned on, it will lock
   // the orientation to the current orientation.
   // |user_rotation_locked()| method returns the current state of the
   // user rotation lock.
   void ToggleUserRotationLock();
 
-  // Set locked to the given |rotation| and save it.
-  void SetLockToRotation(display::Display::Rotation rotation);
-
   // WmActivationObserver:
   void OnWindowActivated(WmWindow* gained_active,
                          WmWindow* lost_active) override;
 
   // aura::WindowObserver:
   void OnWindowDestroying(aura::Window* window) override;
   void OnWindowVisibilityChanged(aura::Window* window, bool visible) override;
 
   // chromeos::AccelerometerReader::Observer:
   void OnAccelerometerUpdated(
@@ skipping 10 matching lines @@
   friend class test::ScreenOrientationControllerTestApi;
 
   // 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);
-
   // Sets the display rotation to |rotation|. Future accelerometer updates
   // should not be used to change the rotation. SetRotationLocked(false) removes
   // the rotation lock.
   void LockRotation(display::Display::Rotation rotation,
                     display::Display::RotationSource source);
 
   // Sets the display rotation based on |lock_orientation|. Future accelerometer
   // updates should not be used to change the rotation. SetRotationLocked(false)
   // removes the rotation lock.
   void LockRotationToOrientation(
@@ skipping 70 matching lines @@
   // Tracks all windows that have requested a lock, as well as the requested
   // orientation.
   std::map<WmWindow*, blink::WebScreenOrientationLockType> locking_windows_;
 
   DISALLOW_COPY_AND_ASSIGN(ScreenOrientationController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_DISPLAY_SCREEN_ORIENTATION_CONTROLLER_CHROMEOS_H_