views/events/event.h - Issue 8113028: Consolidate ui::NativeEvent and base::NativeEvent

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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: sync/resolve 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:

Index: views/events/event.h

diff --git a/views/events/event.h b/views/events/event.h

index d8777e71b78d7b3ab1a1e162f05ed72847c9a01c..5312ecd5fad694c824ad5f471fadf6ed5680f24a 100644

--- a/views/events/event.h

+++ b/views/events/event.h

@@ -33,7 +33,7 @@ namespace views {

#if defined(USE_AURA)

typedef aura::Event* NativeEvent;

#else

-typedef ui::NativeEvent NativeEvent;

+typedef base::NativeEvent NativeEvent;

#endif

class View;

@@ -243,7 +243,7 @@ class VIEWS_EXPORT MouseEvent : public LocatedEvent {

////////////////////////////////////////////////////////////////////////////////

class VIEWS_EXPORT TouchEvent : public LocatedEvent {

public:

- explicit TouchEvent(const NativeEvent& native_event);

+ explicit TouchEvent(const base::NativeEvent& native_event);

// Create a new touch event.

TouchEvent(ui::EventType type,

« no previous file with comments | « ui/base/x/events_x.cc ('k') | views/events/event.cc » ('j') | no next file with comments »