Implement ui_controls for aura

ui/base/x/events_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 "ui/base/events.h"
 
 #include <X11/Xlib.h>
 #include <X11/extensions/XInput2.h>
 
 #include "base/logging.h"
+#if !defined(TOOLKIT_USES_GTK)

[sky, 2011/11/22 00:28:33]

nit: conditional includes after non-conditional includes.

[oshima, 2011/11/22 01:36:10]

Done.

+#include "base/message_pump_x.h"
+#endif
 #include "ui/base/keycodes/keyboard_code_conversion_x.h"
 #include "ui/base/touch/touch_factory.h"
 #include "ui/gfx/point.h"
 
 namespace {
 
 // Scroll amount for each wheelscroll event. 53 is also the value used for GTK+.
 static const int kWheelScrollAmount = 53;
 
 static const int kMinWheelButton = 4;
@@ skipping 328 matching lines @@
   unsigned int deviceid =
       static_cast<XIDeviceEvent*>(native_event->xcookie.data)->sourceid;
   // Force is normalized to fall into [0, 1]
   if (!ui::TouchFactory::GetInstance()->NormalizeTouchParam(
       deviceid, ui::TouchFactory::TP_PRESSURE, &force))
     force = 0.0;
   return force;
 }
 
 base::NativeEvent CreateNoopEvent() {
-  static XEvent* noop = new XEvent();
-  noop->xclient.type = ClientMessage;
-  noop->xclient.display = NULL;
-  noop->xclient.window = None;
-  noop->xclient.message_type = 0;
-  noop->xclient.format = 0;
+  static XEvent* noop = NULL;
+  if (!noop) {
+    noop = new XEvent();
+    noop->xclient.type = ClientMessage;
+    noop->xclient.display = NULL;

[Daniel Erat, 2011/11/22 00:25:32]

just memset it to 0 first?  that way you don't need to initialize these later

[oshima, 2011/11/22 01:36:10]

Actually this wasn't necessary. constructor should take care of it.

+    noop->xclient.window = None;
+    noop->xclient.format = 8;
+  }
+  // TODO(oshima): Remove ifdef once gtk is removed from views.
+#if defined(TOOLKIT_USES_GTK)
+  NOTREACHED();
+#else
+  // Make sure we use atom from current xdisplay, which may
+  // change during the test.
+  noop->xclient.message_type = XInternAtom(
+      base::MessagePumpX::GetDefaultXDisplay(),
+      "noop", False);
+#endif
   return noop;
 }
 
 }  // namespace ui