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

Side by Side Diff: ash/display/mouse_cursor_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/accelerators/accelerator_filter.cc ('k') | ash/display/mouse_cursor_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_DISPLAY_MOUSE_CURSOR_EVENT_FILTER_H 5 #ifndef ASH_DISPLAY_MOUSE_CURSOR_EVENT_FILTER_H
6 #define ASH_DISPLAY_MOUSE_CURSOR_EVENT_FILTER_H 6 #define ASH_DISPLAY_MOUSE_CURSOR_EVENT_FILTER_H
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/gtest_prod_util.h" 10 #include "base/gtest_prod_util.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 // Shows/Hide the indicator for window dragging. The |from| 44 // Shows/Hide the indicator for window dragging. The |from|
45 // is the window where the dragging started. 45 // is the window where the dragging started.
46 void ShowSharedEdgeIndicator(const aura::RootWindow* from); 46 void ShowSharedEdgeIndicator(const aura::RootWindow* from);
47 void HideSharedEdgeIndicator(); 47 void HideSharedEdgeIndicator();
48 48
49 // Overridden from aura::EventFilter: 49 // Overridden from aura::EventFilter:
50 virtual bool PreHandleKeyEvent(aura::Window* target, 50 virtual bool PreHandleKeyEvent(aura::Window* target,
51 ui::KeyEvent* event) OVERRIDE; 51 ui::KeyEvent* event) OVERRIDE;
52 virtual bool PreHandleMouseEvent(aura::Window* target, 52 virtual bool PreHandleMouseEvent(aura::Window* target,
53 ui::MouseEvent* event) OVERRIDE; 53 ui::MouseEvent* event) OVERRIDE;
54 virtual ui::TouchStatus PreHandleTouchEvent( 54 virtual ui::EventResult PreHandleTouchEvent(
55 aura::Window* target, 55 aura::Window* target,
56 ui::TouchEvent* event) OVERRIDE; 56 ui::TouchEvent* event) OVERRIDE;
57 virtual ui::EventResult PreHandleGestureEvent( 57 virtual ui::EventResult PreHandleGestureEvent(
58 aura::Window* target, 58 aura::Window* target,
59 ui::GestureEvent* event) OVERRIDE; 59 ui::GestureEvent* event) OVERRIDE;
60 60
61 private: 61 private:
62 FRIEND_TEST_ALL_PREFIXES(MouseCursorEventFilterTest, SetMouseWarpModeFlag); 62 FRIEND_TEST_ALL_PREFIXES(MouseCursorEventFilterTest, SetMouseWarpModeFlag);
63 FRIEND_TEST_ALL_PREFIXES(MouseCursorEventFilterTest, WarpMouse); 63 FRIEND_TEST_ALL_PREFIXES(MouseCursorEventFilterTest, WarpMouse);
64 FRIEND_TEST_ALL_PREFIXES(MouseCursorEventFilterTest, 64 FRIEND_TEST_ALL_PREFIXES(MouseCursorEventFilterTest,
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 // another display. 98 // another display.
99 scoped_ptr<SharedDisplayEdgeIndicator> shared_display_edge_indicator_; 99 scoped_ptr<SharedDisplayEdgeIndicator> shared_display_edge_indicator_;
100 100
101 DISALLOW_COPY_AND_ASSIGN(MouseCursorEventFilter); 101 DISALLOW_COPY_AND_ASSIGN(MouseCursorEventFilter);
102 }; 102 };
103 103
104 } // namespace internal 104 } // namespace internal
105 } // namespace ash 105 } // namespace ash
106 106
107 #endif // ASH_DISPLAY_MOUSE_CURSOR_EVENT_FILTER_H 107 #endif // ASH_DISPLAY_MOUSE_CURSOR_EVENT_FILTER_H
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_filter.cc ('k') | ash/display/mouse_cursor_event_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698