Aura under Linux is enabled with:

   'use_aura': 1,

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/7850026

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101704 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 11 insertions, 4 deletions

diff --git a/chrome/browser/automation/ui_controls_linux.cc b/chrome/browser/automation/ui_controls_linux.cc
index 9c80f59..6c7c5f7 100644
--- a/chrome/browser/automation/ui_controls_linux.cc
+++ b/chrome/browser/automation/ui_controls_linux.cc
@@ -22,6 +22,13 @@
 
 namespace {
 
+// static
+guint32 XTimeNow() {
+  struct timespec ts;
+  clock_gettime(CLOCK_MONOTONIC, &ts);
+  return ts.tv_sec * 1000 + ts.tv_nsec / 1000000;
+}
+
 class EventWaiter : public MessageLoopForUI::Observer {
  public:
   EventWaiter(Task* task, GdkEventType type, int count)
@@ -66,7 +73,7 @@ void FakeAMouseMotionEvent(gint x, gint y) {
   GdkEvent* event = gdk_event_new(GDK_MOTION_NOTIFY);
 
   event->motion.send_event = false;
-  event->motion.time = gtk_util::XTimeNow();
+  event->motion.time = XTimeNow();
 
   GtkWidget* grab_widget = gtk_grab_get_current();
   if (grab_widget) {
@@ -178,7 +185,7 @@ bool SendMouseEvents(MouseButton type, int state) {
   GdkEvent* event = gdk_event_new(GDK_BUTTON_PRESS);
 
   event->button.send_event = false;
-  event->button.time = gtk_util::XTimeNow();
+  event->button.time = XTimeNow();
 
   gint x, y;
   GtkWidget* grab_widget = gtk_grab_get_current();
@@ -247,7 +254,7 @@ bool SendMouseClick(MouseButton type) {
 
 #if defined(TOOLKIT_VIEWS)
 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) && !defined(USE_AURA)
 void OnConfigure(GtkWidget* gtk_widget, GdkEvent* event, gpointer data) {
   views::Widget* widget = static_cast<views::Widget*>(data);
   gfx::Rect actual = widget->GetWindowScreenBounds();
@@ -275,7 +282,7 @@ void SynchronizeWidgetSize(views::Widget* widget) {
 
 void MoveMouseToCenterAndPress(views::View* view, MouseButton button,
                                int state, Task* task) {
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) && !defined(USE_AURA)
   // X is asynchronous and we need to wait until the window gets
   // resized to desired size.
   SynchronizeWidgetSize(view->GetWidget());