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

Side by Side Diff: ash/system/tray/tray_bubble_view.h

Issue 10912063: events: Get rid of GestureStatus in favour of EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 3 months 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/system/status_area_widget_delegate.cc ('k') | ash/system/tray/tray_bubble_view.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_SYSTEM_TRAY_TRAY_BUBBLE_VIEW_H_ 5 #ifndef ASH_SYSTEM_TRAY_TRAY_BUBBLE_VIEW_H_
6 #define ASH_SYSTEM_TRAY_TRAY_BUBBLE_VIEW_H_ 6 #define ASH_SYSTEM_TRAY_TRAY_BUBBLE_VIEW_H_
7 7
8 #include "ash/wm/shelf_types.h" 8 #include "ash/wm/shelf_types.h"
9 #include "ui/aura/event_filter.h" 9 #include "ui/aura/event_filter.h"
10 #include "ui/views/bubble/bubble_delegate.h" 10 #include "ui/views/bubble/bubble_delegate.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 virtual string16 GetAccessibleName() = 0; 48 virtual string16 GetAccessibleName() = 0;
49 49
50 // Overridden from aura::EventFilter. 50 // Overridden from aura::EventFilter.
51 virtual bool PreHandleKeyEvent(aura::Window* target, 51 virtual bool PreHandleKeyEvent(aura::Window* target,
52 ui::KeyEvent* event) OVERRIDE; 52 ui::KeyEvent* event) OVERRIDE;
53 virtual bool PreHandleMouseEvent(aura::Window* target, 53 virtual bool PreHandleMouseEvent(aura::Window* target,
54 ui::MouseEvent* event) OVERRIDE; 54 ui::MouseEvent* event) OVERRIDE;
55 virtual ui::TouchStatus PreHandleTouchEvent( 55 virtual ui::TouchStatus PreHandleTouchEvent(
56 aura::Window* target, 56 aura::Window* target,
57 ui::TouchEvent* event) OVERRIDE; 57 ui::TouchEvent* event) OVERRIDE;
58 virtual ui::GestureStatus PreHandleGestureEvent( 58 virtual ui::EventResult PreHandleGestureEvent(
59 aura::Window* target, 59 aura::Window* target,
60 ui::GestureEvent* event) OVERRIDE; 60 ui::GestureEvent* event) OVERRIDE;
61 61
62 private: 62 private:
63 void ProcessLocatedEvent(aura::Window* target, 63 void ProcessLocatedEvent(aura::Window* target,
64 const ui::LocatedEvent& event); 64 const ui::LocatedEvent& event);
65 65
66 views::Widget* widget_; 66 views::Widget* widget_;
67 views::View* tray_view_; 67 views::View* tray_view_;
68 68
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 InitParams params_; 133 InitParams params_;
134 Host* host_; 134 Host* host_;
135 135
136 DISALLOW_COPY_AND_ASSIGN(TrayBubbleView); 136 DISALLOW_COPY_AND_ASSIGN(TrayBubbleView);
137 }; 137 };
138 138
139 } // namespace internal 139 } // namespace internal
140 } // namespace ash 140 } // namespace ash
141 141
142 #endif // ASH_SYSTEM_TRAY_TRAY_BUBBLE_VIEW_H_ 142 #endif // ASH_SYSTEM_TRAY_TRAY_BUBBLE_VIEW_H_
OLDNEW
« no previous file with comments | « ash/system/status_area_widget_delegate.cc ('k') | ash/system/tray/tray_bubble_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698