| Index: chrome/browser/chromeos/system/input_device_settings.cc
|
| diff --git a/chrome/browser/chromeos/system/input_device_settings.cc b/chrome/browser/chromeos/system/input_device_settings.cc
|
| index 66ae8f933501437905510f42c2837351910e60e4..2e6fbf47200a47dc3c1f42b61d799d0b9d98c790 100644
|
| --- a/chrome/browser/chromeos/system/input_device_settings.cc
|
| +++ b/chrome/browser/chromeos/system/input_device_settings.cc
|
| @@ -142,21 +142,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_;
|
|
|