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

Side by Side Diff: views/events/event.h

Issue 8113028: Consolidate ui::NativeEvent and base::NativeEvent (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix build Created 9 years, 2 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 VIEWS_EVENTS_EVENT_H_ 5 #ifndef VIEWS_EVENTS_EVENT_H_
6 #define VIEWS_EVENTS_EVENT_H_ 6 #define VIEWS_EVENTS_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"
(...skipping 15 matching lines...) Expand all
26 // TODO(msw): Remove GTK support from views event code when possible. 26 // TODO(msw): Remove GTK support from views event code when possible.
27 #if defined(TOOLKIT_USES_GTK) 27 #if defined(TOOLKIT_USES_GTK)
28 typedef union _GdkEvent GdkEvent; 28 typedef union _GdkEvent GdkEvent;
29 #endif 29 #endif
30 30
31 namespace views { 31 namespace views {
32 32
33 #if defined(USE_AURA) 33 #if defined(USE_AURA)
34 typedef aura::Event* NativeEvent; 34 typedef aura::Event* NativeEvent;
35 #else 35 #else
36 typedef ui::NativeEvent NativeEvent; 36 typedef base::NativeEvent NativeEvent;
37 #endif 37 #endif
38 38
39 class View; 39 class View;
40 40
41 namespace internal { 41 namespace internal {
42 class NativeWidgetView; 42 class NativeWidgetView;
43 class RootView; 43 class RootView;
44 } 44 }
45 45
46 //////////////////////////////////////////////////////////////////////////////// 46 ////////////////////////////////////////////////////////////////////////////////
(...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after
430 430
431 // Bitmask of supported ui::DragDropTypes::DragOperation by the source. 431 // Bitmask of supported ui::DragDropTypes::DragOperation by the source.
432 int source_operations_; 432 int source_operations_;
433 433
434 DISALLOW_COPY_AND_ASSIGN(DropTargetEvent); 434 DISALLOW_COPY_AND_ASSIGN(DropTargetEvent);
435 }; 435 };
436 436
437 } // namespace views 437 } // namespace views
438 438
439 #endif // VIEWS_EVENTS_EVENT_H_ 439 #endif // VIEWS_EVENTS_EVENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698