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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/shell.h

Issue 191223007: Move touch CTM from X into Chrome (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: move CTM update code into a separate file ash/touch/touch_ctm_controller.cc Created 6 years, 9 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
« ash/display/display_info.h ('K') | « ash/display/display_info.cc ('k') | ash/shell.cc » ('j') | ash/touch/touch_ctm_controller.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index 49fbda981fb1dd36582ac53e4b48ce584d6d5797..2ff4cf982d18608f2e5ebe925685bcb1ee909286 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -105,6 +105,7 @@ class SystemTray;
class SystemTrayDelegate;
class SystemTrayNotifier;
class ToplevelWindowEventHandler;
+class TouchCTMController;
class UserActivityDetector;
class UserWallpaperDelegate;
class VideoDetector;
@@ -654,6 +655,7 @@ class ASH_EXPORT Shell
scoped_ptr<WindowSelectorController> window_selector_controller_;
scoped_ptr<internal::FocusCycler> focus_cycler_;
scoped_ptr<DisplayController> display_controller_;
+ scoped_ptr<TouchCTMController> touch_ctm_controller_;
scoped_ptr<HighContrastController> high_contrast_controller_;
scoped_ptr<MagnificationController> magnification_controller_;
scoped_ptr<PartialMagnificationController> partial_magnification_controller_;
« ash/display/display_info.h ('K') | « ash/display/display_info.cc ('k') | ash/shell.cc » ('j') | ash/touch/touch_ctm_controller.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698