Revert 58215 - Revert 58186 - Move the keyboard files from base/ to app/....

chrome/browser/automation/ui_controls_linux.cc

 // Copyright (c) 2009 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 "chrome/browser/automation/ui_controls.h"
 
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
+#include "app/event_synthesis_gtk.h"
 #include "gfx/rect.h"
-#include "base/event_synthesis_gtk.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "chrome/browser/automation/ui_controls_internal.h"
 #include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/test/automation/automation_constants.h"
 
 #if defined(TOOLKIT_VIEWS)
 #include "views/view.h"
 #include "views/widget/widget.h"
 #endif
@@ skipping 67 matching lines @@
 
   gdk_event_put(event);
   gdk_event_free(event);
 }
 
 }  // namespace
 
 namespace ui_controls {
 
 bool SendKeyPress(gfx::NativeWindow window,
-                  base::KeyboardCode key,
+                  app::KeyboardCode key,
                   bool control, bool shift, bool alt, bool command) {
   DCHECK(command == false);  // No command key on Linux
   GdkWindow* event_window = NULL;
   GtkWidget* grab_widget = gtk_grab_get_current();
   if (grab_widget) {
     // If there is a grab, send all events to the grabbed widget.
     event_window = grab_widget->window;
   } else if (window) {
     event_window = GTK_WIDGET(window)->window;
   } else {
     // No target was specified. Send the events to the active toplevel.
     GList* windows = gtk_window_list_toplevels();
     for (GList* element = windows; element; element = g_list_next(element)) {
       GtkWindow* this_window = GTK_WINDOW(element->data);
       if (gtk_window_is_active(this_window)) {
         event_window = GTK_WIDGET(this_window)->window;
         break;
       }
     }
     g_list_free(windows);
   }
   if (!event_window) {
     NOTREACHED() << "Window not specified and none is active";
     return false;
   }
 
   std::vector<GdkEvent*> events;
-  base::SynthesizeKeyPressEvents(event_window, key, control, shift, alt,
+  app::SynthesizeKeyPressEvents(event_window, key, control, shift, alt,
                                  &events);
   for (std::vector<GdkEvent*>::iterator iter = events.begin();
        iter != events.end(); ++iter) {
     gdk_event_put(*iter);
     // gdk_event_put appends a copy of the event.
     gdk_event_free(*iter);
   }
 
   return true;
 }
 
 bool SendKeyPressNotifyWhenDone(gfx::NativeWindow window,
-                                base::KeyboardCode key,
+                                app::KeyboardCode key,
                                 bool control, bool shift,
                                 bool alt, bool command,
                                 Task* task) {
   DCHECK(command == false);  // No command key on Linux
   int release_count = 1;
   if (control)
     release_count++;
   if (shift)
     release_count++;
   if (alt)
@@ skipping 108 matching lines @@
                                int state,
                                Task* task) {
   gfx::Rect bounds = gtk_util::GetWidgetScreenBounds(widget);
   SendMouseMoveNotifyWhenDone(bounds.x() + bounds.width() / 2,
                               bounds.y() + bounds.height() / 2,
                               new ClickTask(button, state, task));
 }
 #endif
 
 }  // namespace ui_controls