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

Side by Side Diff: ash/touch/touch_observer_hud.h

Issue 11364062: ui: Remove TouchStatus in favour of EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/tooltips/tooltip_controller.cc ('k') | ash/touch/touch_observer_hud.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_TOUCH_TOUCH_OBSERVER_HUD_H_ 5 #ifndef ASH_TOUCH_TOUCH_OBSERVER_HUD_H_
6 #define ASH_TOUCH_TOUCH_OBSERVER_HUD_H_ 6 #define ASH_TOUCH_TOUCH_OBSERVER_HUD_H_
7 7
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ui/aura/event_filter.h" 9 #include "ui/aura/event_filter.h"
10 #include "ui/gfx/point.h" 10 #include "ui/gfx/point.h"
(...skipping 21 matching lines...) Expand all
32 virtual ~TouchObserverHUD(); 32 virtual ~TouchObserverHUD();
33 33
34 private: 34 private:
35 void UpdateTouchPointLabel(int index); 35 void UpdateTouchPointLabel(int index);
36 36
37 // Overriden from aura::EventFilter: 37 // Overriden from aura::EventFilter:
38 virtual bool PreHandleKeyEvent(aura::Window* target, 38 virtual bool PreHandleKeyEvent(aura::Window* target,
39 ui::KeyEvent* event) OVERRIDE; 39 ui::KeyEvent* event) OVERRIDE;
40 virtual bool PreHandleMouseEvent(aura::Window* target, 40 virtual bool PreHandleMouseEvent(aura::Window* target,
41 ui::MouseEvent* event) OVERRIDE; 41 ui::MouseEvent* event) OVERRIDE;
42 virtual ui::TouchStatus PreHandleTouchEvent( 42 virtual ui::EventResult PreHandleTouchEvent(
43 aura::Window* target, 43 aura::Window* target,
44 ui::TouchEvent* event) OVERRIDE; 44 ui::TouchEvent* event) OVERRIDE;
45 virtual ui::EventResult PreHandleGestureEvent( 45 virtual ui::EventResult PreHandleGestureEvent(
46 aura::Window* target, 46 aura::Window* target,
47 ui::GestureEvent* event) OVERRIDE; 47 ui::GestureEvent* event) OVERRIDE;
48 48
49 // Overridden from views::WidgetObserver: 49 // Overridden from views::WidgetObserver:
50 virtual void OnWidgetClosing(views::Widget* widget) OVERRIDE; 50 virtual void OnWidgetClosing(views::Widget* widget) OVERRIDE;
51 51
52 static const int kMaxTouchPoints = 32; 52 static const int kMaxTouchPoints = 32;
53 53
54 views::Widget* widget_; 54 views::Widget* widget_;
55 TouchHudCanvas* canvas_; 55 TouchHudCanvas* canvas_;
56 views::Label* touch_labels_[kMaxTouchPoints]; 56 views::Label* touch_labels_[kMaxTouchPoints];
57 gfx::Point touch_positions_[kMaxTouchPoints]; 57 gfx::Point touch_positions_[kMaxTouchPoints];
58 ui::EventType touch_status_[kMaxTouchPoints]; 58 ui::EventType touch_status_[kMaxTouchPoints];
59 59
60 DISALLOW_COPY_AND_ASSIGN(TouchObserverHUD); 60 DISALLOW_COPY_AND_ASSIGN(TouchObserverHUD);
61 }; 61 };
62 62
63 } // namespace internal 63 } // namespace internal
64 } // namespace ash 64 } // namespace ash
65 65
66 #endif // ASH_TOUCH_TOUCH_OBSERVER_HUD_H_ 66 #endif // ASH_TOUCH_TOUCH_OBSERVER_HUD_H_
OLDNEW
« no previous file with comments | « ash/tooltips/tooltip_controller.cc ('k') | ash/touch/touch_observer_hud.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698