diff options
| author | dnicoara <dnicoara@chromium.org> | 2014-10-30 12:53:39 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-30 19:54:33 +0000 |
| commit | 8c3bd1e68124be19b17420144b4b76ece0c87035 (patch) | |
| tree | 4286ec8c26b28b69769c9eb85ed375dd616a0dee /ash/shell.h | |
| parent | 636e0eb369b639e074068fc1a82fe32f7cc6f082 (diff) | |
| download | chromium_src-8c3bd1e68124be19b17420144b4b76ece0c87035.zip chromium_src-8c3bd1e68124be19b17420144b4b76ece0c87035.tar.gz chromium_src-8c3bd1e68124be19b17420144b4b76ece0c87035.tar.bz2 | |
Refactor TouchTransformerConverter to allow support for Ozone
In Ozone the touch events are received in device coordinates. This
change consolidates the different transformations into one function and
makes it use the touchscreen size when computing the transformation for
Ozone and the framebuffer size for X11.
BUG=425258
TESTS=Manually verified that X11 in single, mirror, extended and docked
mode work with external touchscreen.
Review URL: https://codereview.chromium.org/688183002
Cr-Commit-Position: refs/heads/master@{#302135}
Diffstat (limited to 'ash/shell.h')
| -rw-r--r-- | ash/shell.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ash/shell.h b/ash/shell.h index 91b8405a..51c912b 100644 --- a/ash/shell.h +++ b/ash/shell.h @@ -384,11 +384,11 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate, DisplayController* display_controller() { return display_controller_.get(); } -#if defined(OS_CHROMEOS) && defined(USE_X11) +#if defined(OS_CHROMEOS) TouchTransformerController* touch_transformer_controller() { return touch_transformer_controller_.get(); } -#endif // defined(OS_CHROMEOS) && defined(USE_X11) +#endif // defined(OS_CHROMEOS) MouseCursorEventFilter* mouse_cursor_filter() { return mouse_cursor_filter_.get(); } @@ -729,10 +729,11 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate, // Listens for output changes and updates the display manager. scoped_ptr<DisplayChangeObserver> display_change_observer_; + scoped_ptr<TouchTransformerController> touch_transformer_controller_; + #if defined(USE_X11) scoped_ptr<ui::EventHandler> magnifier_key_scroll_handler_; scoped_ptr<ui::EventHandler> speech_feedback_handler_; - scoped_ptr<TouchTransformerController> touch_transformer_controller_; #endif // defined(USE_X11) #endif // defined(OS_CHROMEOS) |