Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(400)

Side by Side Diff: chrome/browser/chromeos/system/input_device_settings.cc

Issue 623293003: replace OVERRIDE and FINAL with override and final in chrome/browser/chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: run git cl format on echo_dialog_view.h Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/system/input_device_settings.h" 5 #include "chrome/browser/chromeos/system/input_device_settings.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/files/file_util.h" 10 #include "base/files/file_util.h"
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 base::Bind(&DeviceExistsBlockingPool, script, exists), 135 base::Bind(&DeviceExistsBlockingPool, script, exists),
136 base::Bind(&RunCallbackUIThread, exists, callback)); 136 base::Bind(&RunCallbackUIThread, exists, callback));
137 } 137 }
138 138
139 class InputDeviceSettingsImpl : public InputDeviceSettings { 139 class InputDeviceSettingsImpl : public InputDeviceSettings {
140 public: 140 public:
141 InputDeviceSettingsImpl(); 141 InputDeviceSettingsImpl();
142 142
143 private: 143 private:
144 // Overridden from InputDeviceSettings. 144 // Overridden from InputDeviceSettings.
145 virtual void TouchpadExists(const DeviceExistsCallback& callback) OVERRIDE; 145 virtual void TouchpadExists(const DeviceExistsCallback& callback) override;
146 virtual void UpdateTouchpadSettings(const TouchpadSettings& settings) 146 virtual void UpdateTouchpadSettings(const TouchpadSettings& settings)
147 OVERRIDE; 147 override;
148 virtual void SetTouchpadSensitivity(int value) OVERRIDE; 148 virtual void SetTouchpadSensitivity(int value) override;
149 virtual void SetTapToClick(bool enabled) OVERRIDE; 149 virtual void SetTapToClick(bool enabled) override;
150 virtual void SetThreeFingerClick(bool enabled) OVERRIDE; 150 virtual void SetThreeFingerClick(bool enabled) override;
151 virtual void SetTapDragging(bool enabled) OVERRIDE; 151 virtual void SetTapDragging(bool enabled) override;
152 virtual void SetNaturalScroll(bool enabled) OVERRIDE; 152 virtual void SetNaturalScroll(bool enabled) override;
153 virtual void MouseExists(const DeviceExistsCallback& callback) OVERRIDE; 153 virtual void MouseExists(const DeviceExistsCallback& callback) override;
154 virtual void UpdateMouseSettings(const MouseSettings& update) OVERRIDE; 154 virtual void UpdateMouseSettings(const MouseSettings& update) override;
155 virtual void SetMouseSensitivity(int value) OVERRIDE; 155 virtual void SetMouseSensitivity(int value) override;
156 virtual void SetPrimaryButtonRight(bool right) OVERRIDE; 156 virtual void SetPrimaryButtonRight(bool right) override;
157 virtual bool ForceKeyboardDrivenUINavigation() OVERRIDE; 157 virtual bool ForceKeyboardDrivenUINavigation() override;
158 virtual void ReapplyTouchpadSettings() OVERRIDE; 158 virtual void ReapplyTouchpadSettings() override;
159 virtual void ReapplyMouseSettings() OVERRIDE; 159 virtual void ReapplyMouseSettings() override;
160 160
161 private: 161 private:
162 TouchpadSettings current_touchpad_settings_; 162 TouchpadSettings current_touchpad_settings_;
163 MouseSettings current_mouse_settings_; 163 MouseSettings current_mouse_settings_;
164 164
165 DISALLOW_COPY_AND_ASSIGN(InputDeviceSettingsImpl); 165 DISALLOW_COPY_AND_ASSIGN(InputDeviceSettingsImpl);
166 }; 166 };
167 167
168 InputDeviceSettingsImpl::InputDeviceSettingsImpl() {} 168 InputDeviceSettingsImpl::InputDeviceSettingsImpl() {}
169 169
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
424 void InputDeviceSettings::SetSettingsForTesting( 424 void InputDeviceSettings::SetSettingsForTesting(
425 InputDeviceSettings* test_settings) { 425 InputDeviceSettings* test_settings) {
426 if (g_test_instance_ == test_settings) 426 if (g_test_instance_ == test_settings)
427 return; 427 return;
428 delete g_test_instance_; 428 delete g_test_instance_;
429 g_test_instance_ = test_settings; 429 g_test_instance_ = test_settings;
430 } 430 }
431 431
432 } // namespace system 432 } // namespace system
433 } // namespace chromeos 433 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/system/fake_input_device_settings.h ('k') | chrome/browser/chromeos/system/pointer_device_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698