diff options
| author | kylechar <kylechar@chromium.org> | 2016-01-13 09:47:43 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-13 17:48:30 +0000 |
| commit | df071679f2e11873144fa1f2d8ed045a69005f04 (patch) | |
| tree | d876e814f7292aade06c493c0de3c652e2607894 /ash | |
| parent | fa0349320e33919039f9f414887b340edd491fd1 (diff) | |
| download | chromium_src-df071679f2e11873144fa1f2d8ed045a69005f04.zip chromium_src-df071679f2e11873144fa1f2d8ed045a69005f04.tar.gz chromium_src-df071679f2e11873144fa1f2d8ed045a69005f04.tar.bz2 | |
Change base::NativeEvent to XEvent in DeviceDataManagerX11.
DeviceDataManagerX11 uses base::NativeEvent and assumes it is always an
XEvent*. The code will only compile if this is true. This updates all
functions that take base::NativeEvent to take XEvent instead. This will
allow DeviceDataManagerX11 to be reused with ozone running on X11 where
base::NativeEvent is a void* instead.
This also changes const XEvent* to const XEvent& to comply with style
guide. All methods assume a non-null XEvent* currently. Update method
calls appropriately elsewhere in the code.
Also changes CHECK(a <= b) to CHECK_GE(a, b) due to linter complaining.
BUG=361137
Review URL: https://codereview.chromium.org/1586673002
Cr-Commit-Position: refs/heads/master@{#369209}
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc b/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc index 3c7e09e..1e5c82f 100644 --- a/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc +++ b/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc @@ -149,9 +149,9 @@ void ScopedDisableInternalMouseAndKeyboardX11::DidProcessEvent( static_cast<ui::DeviceDataManagerX11*>( ui::DeviceDataManager::GetInstance()); if (xievent->evtype != XI_Motion || - device_data_manager->IsFlingEvent(event) || - device_data_manager->IsScrollEvent(event) || - device_data_manager->IsCMTMetricsEvent(event)) { + device_data_manager->IsFlingEvent(*event) || + device_data_manager->IsScrollEvent(*event) || + device_data_manager->IsCMTMetricsEvent(*event)) { return; } if (xievent->sourceid == touchpad_device_id_) { |