Consolidate ui::NativeEvent and base::NativeEvent

views/events/event_x.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "views/events/event.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 #include <X11/extensions/XInput2.h>
 #include <X11/Xlib.h>
@@ skipping 151 matching lines @@
   // used by X11 internally.
   key.state &= ~kIgnoredModifiers;
   uint16 ch = GetCharacterFromXKeyEvent(&key);
   return ch ? ch :
       GetCharacterFromKeyCode(key_code_, flags() & ui::EF_SHIFT_DOWN);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TouchEvent, public:
 
-TouchEvent::TouchEvent(const ui::NativeEvent& native_event)
+TouchEvent::TouchEvent(const base::NativeEvent& native_event)

[msw, 2011/10/04 18:10:37]

I *think* you can omit the base namespace here and use the views:: typdef (the
declaration uses the views typedef); but this isn't in a !USE_ARUA block... I
also wonder where the aura build gets the definition for this ctor; there's
likely an error here on linux USE_AURA.

[oshima, 2011/10/04 19:42:48]

This is created in accelerator_handler_touch.cc using xevent, so base seems to
be correct choice. We probably need to revisit when we add touch support for
aura though.

[msw, 2011/10/04 20:45:41]

Okay, either way the base:: qualifier should either be present in both the decl
and def or neither. Optionally add a TODO about aura support.

     : LocatedEvent(native_event),
       touch_id_(GetTouchIDFromXEvent(native_event)),
       radius_x_(GetTouchParamFromXEvent(native_event,
                                         ui::TouchFactory::TP_TOUCH_MAJOR,
                                         2.0) / 2.0),
       radius_y_(GetTouchParamFromXEvent(native_event,
                                         ui::TouchFactory::TP_TOUCH_MINOR,
                                         2.0) / 2.0),
       rotation_angle_(GetTouchParamFromXEvent(native_event,
                                               ui::TouchFactory::TP_ORIENTATION,
@@ skipping 18 matching lines @@
     float slot;
     if (factory->ExtractTouchParam(*native_event,
                                    ui::TouchFactory::TP_SLOT_ID, &slot)) {
       factory->SetSlotUsed(slot, type() == ui::ET_TOUCH_PRESSED);
     }
   }
 #endif
 }
 
 }  // namespace views