Revert of Don't handle NaturalScroll in Chrome but pass it to CMT instead

chrome/browser/chromeos/system/input_device_settings.h

 // Copyright (c) 2012 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 CHROME_BROWSER_CHROMEOS_SYSTEM_INPUT_DEVICE_SETTINGS_H_
 #define CHROME_BROWSER_CHROMEOS_SYSTEM_INPUT_DEVICE_SETTINGS_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 78 matching lines @@
 
   void SetTapToClick(bool enabled);
   bool GetTapToClick() const;
 
   void SetThreeFingerClick(bool enabled);
   bool GetThreeFingerClick() const;
 
   void SetTapDragging(bool enabled);
   bool GetTapDragging() const;
 
-  void SetNaturalScroll(bool enabled);
-  bool GetNaturalScroll() const;
-
   // Updates |this| with |settings|. If at least one setting was updated returns
   // true.
   // |argv| is filled with arguments of script, that should be launched in order
   // to apply update. This argument is optional and could be NULL.
   bool Update(const TouchpadSettings& settings, std::vector<std::string>* argv);
 
  private:
   internal::Optional<int> sensitivity_;
   internal::Optional<bool> tap_to_click_;
   internal::Optional<bool> three_finger_click_;
   internal::Optional<bool> tap_dragging_;
-  internal::Optional<bool> natural_scroll_;
 };
 
 // Auxiliary class used to update several mouse settings at a time. User
 // should set any number of settings and pass object to UpdateMouseSettings
 // method of InputDeviceSettings.
 // Objects of this class have no default values for settings, so it is error
 // to call Get* method before calling corresponding Set* method at least
 // once.
 class MouseSettings {
  public:
@@ skipping 46 matching lines @@
 
   // Turns tap to click on/off.
   virtual void SetTapToClick(bool enabled) = 0;
 
   // Switch for three-finger click.
   virtual void SetThreeFingerClick(bool enabled) = 0;
 
   // Turns tap-dragging on/off.
   virtual void SetTapDragging(bool enabled) = 0;
 
-  // Turns natural scrolling on/off for all devices except wheel mice
-  virtual void SetNaturalScroll(bool enabled) = 0;
-
   // Calls |callback| asynchronously after determining if a mouse is connected.
   virtual void MouseExists(const DeviceExistsCallback& callback) = 0;
 
   // Updates several mouse settings at a time. Updates only settings that
   // are set in |settings| object. It is more efficient to use this method to
   // update several settings then calling Set* methods one by one.
   virtual void UpdateMouseSettings(const MouseSettings& settings) = 0;
 
   // Sets the mouse sensitivity in the range [kMinPointerSensitivity,
   // kMaxPointerSensitivity].
@@ skipping 10 matching lines @@
   virtual void ReapplyTouchpadSettings() = 0;
 
   // Reapplies previously set mouse settings.
   virtual void ReapplyMouseSettings() = 0;
 };
 
 }  // namespace system
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_SYSTEM_INPUT_DEVICE_SETTINGS_H_