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

Unified Diff: chrome/browser/chromeos/system/input_device_settings.h

Issue 397063004: wip: not complete. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/chromeos/system/input_device_settings.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/system/input_device_settings.h
diff --git a/chrome/browser/chromeos/system/input_device_settings.h b/chrome/browser/chromeos/system/input_device_settings.h
index ba938a13d1256af7700ec17edbc673a0c03a56de..8ee6653d921537a47783ebcf5e2f5dc848fb671b 100644
--- a/chrome/browser/chromeos/system/input_device_settings.h
+++ b/chrome/browser/chromeos/system/input_device_settings.h
@@ -99,12 +99,16 @@ class TouchpadSettings {
void SetNaturalScroll(bool enabled);
bool GetNaturalScroll() const;
+#if defined(USE_OZONE)
+ // Updates |this| with |settings|. If at least one settings was updated, configures all associated ozone event converters appropriately for the new setting.
+ bool Update(const TouchpadSettings& settings);
+#else
// 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);
-
+#endif
private:
internal::Optional<int> sensitivity_;
internal::Optional<bool> tap_to_click_;
@@ -130,11 +134,16 @@ class MouseSettings {
void SetPrimaryButtonRight(bool right);
bool GetPrimaryButtonRight() const;
- // Updates |this| with |settings|. If at least one setting was updated returns
+#if defined(USE_OZONE)
+ // Updates |this| with |update|. If at least one settings was updated, configures all associated ozone event converters appropriately for the new setting.
+ bool Update(const MouseSettings& update);
+#else
+ // Updates |this| with |update|. 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 MouseSettings& update, std::vector<std::string>* argv);
+#endif
private:
internal::Optional<int> sensitivity_;
« no previous file with comments | « no previous file | chrome/browser/chromeos/system/input_device_settings.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698