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

Side by Side Diff: ash/wm/panel_window_event_filter.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/wm/overlay_event_filter.cc ('k') | ash/wm/panel_window_event_filter.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_WM_PANEL_WINDOW_EVENT_FILTER_H 5 #ifndef ASH_WM_PANEL_WINDOW_EVENT_FILTER_H
6 #define ASH_WM_PANEL_WINDOW_EVENT_FILTER_H 6 #define ASH_WM_PANEL_WINDOW_EVENT_FILTER_H
7 7
8 #include "ui/aura/event_filter.h" 8 #include "ui/aura/event_filter.h"
9 #include "ash/wm/panel_layout_manager.h" 9 #include "ash/wm/panel_layout_manager.h"
10 #include "ui/gfx/point.h" 10 #include "ui/gfx/point.h"
(...skipping 14 matching lines...) Expand all
25 public: 25 public:
26 PanelWindowEventFilter(aura::Window* panel_container, 26 PanelWindowEventFilter(aura::Window* panel_container,
27 PanelLayoutManager* layout_manager); 27 PanelLayoutManager* layout_manager);
28 virtual ~PanelWindowEventFilter(); 28 virtual ~PanelWindowEventFilter();
29 29
30 // Overriden from aura::EventFilter: 30 // Overriden from aura::EventFilter:
31 virtual bool PreHandleKeyEvent(aura::Window* target, 31 virtual bool PreHandleKeyEvent(aura::Window* target,
32 ui::KeyEvent* event) OVERRIDE; 32 ui::KeyEvent* event) OVERRIDE;
33 virtual bool PreHandleMouseEvent(aura::Window* target, 33 virtual bool PreHandleMouseEvent(aura::Window* target,
34 ui::MouseEvent* event) OVERRIDE; 34 ui::MouseEvent* event) OVERRIDE;
35 virtual ui::TouchStatus PreHandleTouchEvent( 35 virtual ui::EventResult PreHandleTouchEvent(
36 aura::Window* target, 36 aura::Window* target,
37 ui::TouchEvent* event) OVERRIDE; 37 ui::TouchEvent* event) OVERRIDE;
38 virtual ui::EventResult PreHandleGestureEvent( 38 virtual ui::EventResult PreHandleGestureEvent(
39 aura::Window* target, 39 aura::Window* target,
40 ui::GestureEvent* event) OVERRIDE; 40 ui::GestureEvent* event) OVERRIDE;
41 41
42 private: 42 private:
43 enum DragState { 43 enum DragState {
44 DRAG_NONE, 44 DRAG_NONE,
45 DRAG_CLICKED, 45 DRAG_CLICKED,
46 DRAG_STARTED 46 DRAG_STARTED
47 }; 47 };
48 48
49 bool HandleDrag(aura::Window* target, ui::LocatedEvent* event); 49 bool HandleDrag(aura::Window* target, ui::LocatedEvent* event);
50 void FinishDrag(); 50 void FinishDrag();
51 51
52 aura::Window* panel_container_; 52 aura::Window* panel_container_;
53 PanelLayoutManager* layout_manager_; 53 PanelLayoutManager* layout_manager_;
54 gfx::Point drag_origin_; 54 gfx::Point drag_origin_;
55 gfx::Point drag_location_in_dragged_window_; 55 gfx::Point drag_location_in_dragged_window_;
56 aura::Window* dragged_panel_; 56 aura::Window* dragged_panel_;
57 DragState drag_state_; 57 DragState drag_state_;
58 58
59 DISALLOW_COPY_AND_ASSIGN(PanelWindowEventFilter); 59 DISALLOW_COPY_AND_ASSIGN(PanelWindowEventFilter);
60 }; 60 };
61 61
62 } 62 }
63 } 63 }
64 #endif // ASH_WM_PANEL_EVENT_FILTER_H 64 #endif // ASH_WM_PANEL_EVENT_FILTER_H
OLDNEW
« no previous file with comments | « ash/wm/overlay_event_filter.cc ('k') | ash/wm/panel_window_event_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698