diff options
| author | mohsen@chromium.org <mohsen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-01 19:27:13 +0000 |
|---|---|---|
| committer | mohsen@chromium.org <mohsen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-01 19:27:13 +0000 |
| commit | 5817504024ccc2ee20f5c5019b8910f27ea9dcac (patch) | |
| tree | bc7e7223eed30c6bac3d320dd8fb760ad080d9ee /ash/shell.h | |
| parent | 2f93bcc8883a14ad50f51ccb0d127cf10f2c0bf4 (diff) | |
| download | chromium_src-5817504024ccc2ee20f5c5019b8910f27ea9dcac.zip chromium_src-5817504024ccc2ee20f5c5019b8910f27ea9dcac.tar.gz chromium_src-5817504024ccc2ee20f5c5019b8910f27ea9dcac.tar.bz2 | |
Added touch HUD for all displays
Previously, there was only one touch HUD for the primary display and
other displays had none. Now each display gets its own touch HUD when
added.
BUG=172237
Review URL: https://chromiumcodereview.appspot.com/13106004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191635 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.h')
| -rw-r--r-- | ash/shell.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/ash/shell.h b/ash/shell.h index 7e3fab3c..e644d2a 100644 --- a/ash/shell.h +++ b/ash/shell.h @@ -286,9 +286,6 @@ class ASH_EXPORT Shell views::corewm::TooltipController* tooltip_controller() { return tooltip_controller_.get(); } - internal::TouchObserverHUD* touch_observer_hud() { - return touch_observer_hud_.get(); - } internal::EventRewriterEventFilter* event_rewriter_filter() { return event_rewriter_filter_.get(); } @@ -561,10 +558,6 @@ class ASH_EXPORT Shell // An event filter that pre-handles all key events to send them to an IME. scoped_ptr<views::corewm::InputMethodEventFilter> input_method_filter_; - // An event filter that silently keeps track of all touch events and controls - // a heads-up display. This is enabled only if --ash-touch-hud flag is used. - scoped_ptr<internal::TouchObserverHUD> touch_observer_hud_; - scoped_ptr<internal::DisplayManager> display_manager_; #if defined(OS_CHROMEOS) |