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

Side by Side Diff: aura/event.h

Issue 7833016: aura: A few changes to have aura_demo compile and run on linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: events Created 9 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 AURA_EVENT_H_ 5 #ifndef AURA_EVENT_H_
6 #define AURA_EVENT_H_ 6 #define AURA_EVENT_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/time.h" 10 #include "base/time.h"
11 #include "ui/base/events.h" 11 #include "ui/base/events.h"
12 #include "ui/base/keycodes/keyboard_codes.h" 12 #include "ui/base/keycodes/keyboard_codes.h"
13 #include "ui/gfx/point.h" 13 #include "ui/gfx/point.h"
14 14
15 namespace aura {
16
17 #if defined(OS_WIN) 15 #if defined(OS_WIN)
18 typedef MSG NativeEvent; 16 typedef MSG NativeEvent;
Ben Goodger (Google) 2011/09/04 16:35:45 I think these should stay within the aura namespac
sadrul 2011/09/04 18:14:13 Ah yes. Undid the change (had to move the typedef
19 #elif defined(USE_X11) 17 #elif defined(USE_X11)
20 typedef union _XEvent XEvent; 18 typedef union _XEvent XEvent;
21 typedef XEvent* NativeEvent; 19 typedef XEvent* NativeEvent;
22 #endif 20 #endif
23 21
22 namespace aura {
23
24 class Window; 24 class Window;
25 25
26 class Event { 26 class Event {
27 public: 27 public:
28 const NativeEvent& native_event() const { return native_event_; } 28 const NativeEvent& native_event() const { return native_event_; }
29 ui::EventType type() const { return type_; } 29 ui::EventType type() const { return type_; }
30 const base::Time& time_stamp() const { return time_stamp_; } 30 const base::Time& time_stamp() const { return time_stamp_; }
31 int flags() const { return flags_; } 31 int flags() const { return flags_; }
32 32
33 protected: 33 protected:
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 98
99 ui::KeyboardCode key_code() const { return key_code_; } 99 ui::KeyboardCode key_code() const { return key_code_; }
100 100
101 private: 101 private:
102 ui::KeyboardCode key_code_; 102 ui::KeyboardCode key_code_;
103 }; 103 };
104 104
105 } // namespace aura 105 } // namespace aura
106 106
107 #endif // AURA_EVENT_H_ 107 #endif // AURA_EVENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698