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

Side by Side Diff: ash/wm/overlay_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/event_rewriter_event_filter.cc ('k') | ash/wm/overlay_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_OVERLAY_EVENT_FILTER_H_ 5 #ifndef ASH_WM_OVERLAY_EVENT_FILTER_H_
6 #define ASH_WM_OVERLAY_EVENT_FILTER_H_ 6 #define ASH_WM_OVERLAY_EVENT_FILTER_H_
7 7
8 #include "ash/shell_observer.h" 8 #include "ash/shell_observer.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "ui/aura/event_filter.h" 10 #include "ui/aura/event_filter.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 void Deactivate(); 47 void Deactivate();
48 48
49 // Cancels the partial screenshot UI. Do nothing if it's not activated. 49 // Cancels the partial screenshot UI. Do nothing if it's not activated.
50 void Cancel(); 50 void Cancel();
51 51
52 // aura::EventFilter overrides: 52 // aura::EventFilter overrides:
53 virtual bool PreHandleKeyEvent( 53 virtual bool PreHandleKeyEvent(
54 aura::Window* target, ui::KeyEvent* event) OVERRIDE; 54 aura::Window* target, ui::KeyEvent* event) OVERRIDE;
55 virtual bool PreHandleMouseEvent( 55 virtual bool PreHandleMouseEvent(
56 aura::Window* target, ui::MouseEvent* event) OVERRIDE; 56 aura::Window* target, ui::MouseEvent* event) OVERRIDE;
57 virtual ui::TouchStatus PreHandleTouchEvent( 57 virtual ui::EventResult PreHandleTouchEvent(
58 aura::Window* target, ui::TouchEvent* event) OVERRIDE; 58 aura::Window* target, ui::TouchEvent* event) OVERRIDE;
59 virtual ui::EventResult PreHandleGestureEvent( 59 virtual ui::EventResult PreHandleGestureEvent(
60 aura::Window* target, ui::GestureEvent* event) OVERRIDE; 60 aura::Window* target, ui::GestureEvent* event) OVERRIDE;
61 61
62 // ShellObserver overrides: 62 // ShellObserver overrides:
63 virtual void OnLoginStateChanged(user::LoginStatus status) OVERRIDE; 63 virtual void OnLoginStateChanged(user::LoginStatus status) OVERRIDE;
64 virtual void OnAppTerminating() OVERRIDE; 64 virtual void OnAppTerminating() OVERRIDE;
65 virtual void OnLockStateChanged(bool locked) OVERRIDE; 65 virtual void OnLockStateChanged(bool locked) OVERRIDE;
66 66
67 private: 67 private:
68 Delegate* delegate_; 68 Delegate* delegate_;
69 69
70 DISALLOW_COPY_AND_ASSIGN(OverlayEventFilter); 70 DISALLOW_COPY_AND_ASSIGN(OverlayEventFilter);
71 }; 71 };
72 72
73 } // namespace internal 73 } // namespace internal
74 } // namespace ash 74 } // namespace ash
75 75
76 #endif // ASH_WM_OVERLAY_EVENT_FILTER_H_ 76 #endif // ASH_WM_OVERLAY_EVENT_FILTER_H_
OLDNEW
« no previous file with comments | « ash/wm/event_rewriter_event_filter.cc ('k') | ash/wm/overlay_event_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698