Move automation/ui_controls to ui/ui_controls

chrome/browser/automation/testing_automation_provider_gtk.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 "chrome/browser/automation/testing_automation_provider.h"
 
 #include <gtk/gtk.h>
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/automation/automation_window_tracker.h"
-#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/view_id_util.h"
+#include "ui/base/gtk/gtk_screen_util.h"
 
 void TestingAutomationProvider::ActivateWindow(int handle) {
   NOTIMPLEMENTED();
 }
 
 void TestingAutomationProvider::IsWindowMaximized(int handle,
                                                   bool* is_maximized,
                                                   bool* success) {
   *success = false;
   NOTIMPLEMENTED();
@@ skipping 18 matching lines @@
                                               static_cast<ViewID>(view_id));
     if (!widget)
       return;
     *success = true;
 
     GtkAllocation allocation;
     gtk_widget_get_allocation(widget, &allocation);
     *bounds = gfx::Rect(allocation.width, allocation.height);
     gint x, y;
     if (screen_coordinates) {
-      gfx::Point point = gtk_util::GetWidgetScreenPosition(widget);
+      gfx::Point point = ui::GetWidgetScreenPosition(widget);
       x = point.x();
       y = point.y();
     } else {
       gtk_widget_translate_coordinates(widget, GTK_WIDGET(window),
                                        0, 0, &x, &y);
     }
     bounds->set_origin(gfx::Point(x, y));
   }
 }
 #endif
@@ skipping 30 matching lines @@
     }
     *result = true;
   }
 }
 
 void TestingAutomationProvider::GetWindowTitle(int handle, string16* text) {
   gfx::NativeWindow window = window_tracker_->GetResource(handle);
   const gchar* title = gtk_window_get_title(window);
   text->assign(UTF8ToUTF16(title));
 }