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

Unified Diff: ash/system/tray/tray_bubble_view.h

Issue 10827145: Convert Aura to use ui::Event. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/magnifier/magnification_controller.cc ('k') | ash/system/tray/tray_bubble_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray/tray_bubble_view.h
===================================================================
--- ash/system/tray/tray_bubble_view.h (revision 150582)
+++ ash/system/tray/tray_bubble_view.h (working copy)
@@ -9,7 +9,7 @@
#include "ui/aura/event_filter.h"
#include "ui/views/bubble/bubble_delegate.h"
-namespace aura {
+namespace ui {
class LocatedEvent;
}
@@ -48,18 +48,18 @@
// Overridden from aura::EventFilter.
virtual bool PreHandleKeyEvent(aura::Window* target,
- aura::KeyEvent* event) OVERRIDE;
+ ui::KeyEvent* event) OVERRIDE;
virtual bool PreHandleMouseEvent(aura::Window* target,
- aura::MouseEvent* event) OVERRIDE;
+ ui::MouseEvent* event) OVERRIDE;
virtual ui::TouchStatus PreHandleTouchEvent(
aura::Window* target,
- aura::TouchEvent* event) OVERRIDE;
+ ui::TouchEventImpl* event) OVERRIDE;
virtual ui::GestureStatus PreHandleGestureEvent(
aura::Window* target,
- aura::GestureEvent* event) OVERRIDE;
+ ui::GestureEventImpl* event) OVERRIDE;
private:
- void ProcessLocatedEvent(const aura::LocatedEvent& event);
+ void ProcessLocatedEvent(const ui::LocatedEvent& event);
views::Widget* widget_;
views::View* tray_view_;
« no previous file with comments | « ash/magnifier/magnification_controller.cc ('k') | ash/system/tray/tray_bubble_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698