| 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_;
|
|
|