Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / system / input_device_settings.cc

diff --git a/src/chrome/browser/chromeos/system/input_device_settings.cc b/src/chrome/browser/chromeos/system/input_device_settings.cc
index 66ae8f9..5da28b3 100644 (file)
--- a/src/chrome/browser/chromeos/system/input_device_settings.cc
+++ b/src/chrome/browser/chromeos/system/input_device_settings.cc
@@ -21,7 +21,6 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
-#include "chrome/common/pref_names.h"
 #include "chromeos/system/statistics_provider.h"
 #include "content/public/browser/browser_thread.h"
 
@@ -142,21 +141,21 @@ class InputDeviceSettingsImpl : public InputDeviceSettings {
 
  private:
   // Overridden from InputDeviceSettings.
-  virtual void TouchpadExists(const DeviceExistsCallback& callback) OVERRIDE;
+  virtual void TouchpadExists(const DeviceExistsCallback& callback) override;
   virtual void UpdateTouchpadSettings(const TouchpadSettings& settings)
-      OVERRIDE;
-  virtual void SetTouchpadSensitivity(int value) OVERRIDE;
-  virtual void SetTapToClick(bool enabled) OVERRIDE;
-  virtual void SetThreeFingerClick(bool enabled) OVERRIDE;
-  virtual void SetTapDragging(bool enabled) OVERRIDE;
-  virtual void SetNaturalScroll(bool enabled) OVERRIDE;
-  virtual void MouseExists(const DeviceExistsCallback& callback) OVERRIDE;
-  virtual void UpdateMouseSettings(const MouseSettings& update) OVERRIDE;
-  virtual void SetMouseSensitivity(int value) OVERRIDE;
-  virtual void SetPrimaryButtonRight(bool right) OVERRIDE;
-  virtual bool ForceKeyboardDrivenUINavigation() OVERRIDE;
-  virtual void ReapplyTouchpadSettings() OVERRIDE;
-  virtual void ReapplyMouseSettings() OVERRIDE;
+      override;
+  virtual void SetTouchpadSensitivity(int value) override;
+  virtual void SetTapToClick(bool enabled) override;
+  virtual void SetThreeFingerClick(bool enabled) override;
+  virtual void SetTapDragging(bool enabled) override;
+  virtual void SetNaturalScroll(bool enabled) override;
+  virtual void MouseExists(const DeviceExistsCallback& callback) override;
+  virtual void UpdateMouseSettings(const MouseSettings& update) override;
+  virtual void SetMouseSensitivity(int value) override;
+  virtual void SetPrimaryButtonRight(bool right) override;
+  virtual bool ForceKeyboardDrivenUINavigation() override;
+  virtual void ReapplyTouchpadSettings() override;
+  virtual void ReapplyMouseSettings() override;
 
  private:
   TouchpadSettings current_touchpad_settings_;