diff options
| author | spang@chromium.org <spang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-22 04:15:20 +0000 |
|---|---|---|
| committer | spang@chromium.org <spang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-22 04:15:20 +0000 |
| commit | 8516b440e37066d51f7857cf98d67a8d4c9d3393 (patch) | |
| tree | 92b8ed0850de37de9d7936d124fd56eea8fda0fb /ui | |
| parent | 6bcc45b3c23fdc5df364b122d88609eec2d52e7e (diff) | |
| download | chromium_src-8516b440e37066d51f7857cf98d67a8d4c9d3393.zip chromium_src-8516b440e37066d51f7857cf98d67a8d4c9d3393.tar.gz chromium_src-8516b440e37066d51f7857cf98d67a8d4c9d3393.tar.bz2 | |
events: Move --touch-calibration flag to event_switches
We need this from ui/events/ozone to access the touchscreen calibration in
ozone builds, so move it to event switches.
BUG=355046
TEST=build
Review URL: https://codereview.chromium.org/208423004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258774 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/aura/window_tree_host_x11.cc | 1 | ||||
| -rw-r--r-- | ui/base/ui_base_switches.cc | 5 | ||||
| -rw-r--r-- | ui/base/ui_base_switches.h | 4 | ||||
| -rw-r--r-- | ui/events/event_switches.cc | 5 | ||||
| -rw-r--r-- | ui/events/event_switches.h | 4 |
5 files changed, 10 insertions, 9 deletions
diff --git a/ui/aura/window_tree_host_x11.cc b/ui/aura/window_tree_host_x11.cc index 4048a5d..a57f2a9 100644 --- a/ui/aura/window_tree_host_x11.cc +++ b/ui/aura/window_tree_host_x11.cc @@ -39,6 +39,7 @@ #include "ui/compositor/dip_util.h" #include "ui/compositor/layer.h" #include "ui/events/event.h" +#include "ui/events/event_switches.h" #include "ui/events/event_utils.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/events/x/device_data_manager.h" diff --git a/ui/base/ui_base_switches.cc b/ui/base/ui_base_switches.cc index 91fc9a9..ad78080 100644 --- a/ui/base/ui_base_switches.cc +++ b/ui/base/ui_base_switches.cc @@ -68,9 +68,4 @@ const char kTouchOptimizedUIDisabled[] = "disabled"; const char kTabletUI[] = "tablet-ui"; #endif -#if defined(USE_XI2_MT) -// The calibration factors given as "<left>,<right>,<top>,<bottom>". -const char kTouchCalibration[] = "touch-calibration"; -#endif - } // namespace switches diff --git a/ui/base/ui_base_switches.h b/ui/base/ui_base_switches.h index 3a3ea3a..607d3ae 100644 --- a/ui/base/ui_base_switches.h +++ b/ui/base/ui_base_switches.h @@ -35,10 +35,6 @@ UI_BASE_EXPORT extern const char kTouchOptimizedUIEnabled[]; UI_BASE_EXPORT extern const char kTabletUI[]; #endif -#if defined(USE_XI2_MT) -UI_BASE_EXPORT extern const char kTouchCalibration[]; -#endif - } // namespace switches #endif // UI_BASE_UI_BASE_SWITCHES_H_ diff --git a/ui/events/event_switches.cc b/ui/events/event_switches.cc index 195e2bb..314370a 100644 --- a/ui/events/event_switches.cc +++ b/ui/events/event_switches.cc @@ -27,4 +27,9 @@ const char kTouchEventsDisabled[] = "disabled"; const char kTouchDevices[] = "touch-devices"; #endif +#if defined(USE_XI2_MT) +// The calibration factors given as "<left>,<right>,<top>,<bottom>". +const char kTouchCalibration[] = "touch-calibration"; +#endif + } // namespace switches diff --git a/ui/events/event_switches.h b/ui/events/event_switches.h index d434304..caaa779 100644 --- a/ui/events/event_switches.h +++ b/ui/events/event_switches.h @@ -20,6 +20,10 @@ EVENTS_BASE_EXPORT extern const char kTouchEventsDisabled[]; EVENTS_BASE_EXPORT extern const char kTouchDevices[]; #endif +#if defined(USE_XI2_MT) +EVENTS_BASE_EXPORT extern const char kTouchCalibration[]; +#endif + } // namespace switches #endif // UI_EVENTS_EVENTS_SWITCHES_H_ |