Move automation/ui_controls to ui/ui_controls

chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.cc

Index: chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.cc
diff --git a/chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.cc b/chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.cc
index 9824131841c6ffef011299e2219ee501a67ba8eb..289179f81110ac7b609ec405d542ae2e1e5a3c51 100644
--- a/chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.cc
+++ b/chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.cc
@@ -21,6 +21,7 @@
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents.h"
+#include "ui/base/gtk/gtk_screen_util.h"
 #include "ui/gfx/screen.h"
 
 using content::OpenURLParams;
@@ -376,7 +377,7 @@ TabStripGtk* DraggedTabControllerGtk::GetTabStripIfItContains(
   // Make sure the specified screen point is actually within the bounds of the
   // specified tabstrip...
   gfx::Rect tabstrip_bounds =
-      gtk_util::GetWidgetScreenBounds(tabstrip->tabstrip_.get());
+      ui::GetWidgetScreenBounds(tabstrip->tabstrip_.get());
   if (screen_point.x() < tabstrip_bounds.right() &&
       screen_point.x() >= tabstrip_bounds.x()) {
     // TODO(beng): make this be relative to the start position of the mouse for
@@ -421,7 +422,7 @@ void DraggedTabControllerGtk::Attach(TabStripGtk* attached_tabstrip,
 
   GtkWidget* parent_window = gtk_widget_get_parent(
       gtk_widget_get_parent(attached_tabstrip_->tabstrip_.get()));
-  gfx::Rect window_bounds = gtk_util::GetWidgetScreenBounds(parent_window);
+  gfx::Rect window_bounds = ui::GetWidgetScreenBounds(parent_window);
   dragged_view_->Attach(static_cast<int>(floor(selected_width + 0.5)),
                         TabGtk::GetMiniWidth(), window_bounds.width());
 
@@ -504,7 +505,7 @@ void DraggedTabControllerGtk::Detach() {
 gfx::Point DraggedTabControllerGtk::ConvertScreenPointToTabStripPoint(
     TabStripGtk* tabstrip, const gfx::Point& screen_point) {
   gfx::Point tabstrip_screen_point =
-      gtk_util::GetWidgetScreenPosition(tabstrip->tabstrip_.get());
+      ui::GetWidgetScreenPosition(tabstrip->tabstrip_.get());
   return screen_point.Subtract(tabstrip_screen_point);
 }
 
@@ -576,7 +577,7 @@ gfx::Point DraggedTabControllerGtk::GetDraggedViewPoint(
   // If we're not attached, we just use x and y from above.
   if (attached_tabstrip_) {
     gfx::Rect tabstrip_bounds =
-        gtk_util::GetWidgetScreenBounds(attached_tabstrip_->tabstrip_.get());
+        ui::GetWidgetScreenBounds(attached_tabstrip_->tabstrip_.get());
     // Snap the dragged tab to the tabstrip if we are attached, detaching
     // only when the mouse position (screen_point) exceeds the screen bounds
     // of the tabstrip.
@@ -820,7 +821,7 @@ gfx::Rect DraggedTabControllerGtk::GetAnimateBounds() {
   gfx::Rect bounds = tab->GetRequisition();
   GtkWidget* widget = tab->widget();
   GtkWidget* parent = gtk_widget_get_parent(widget);
-  gfx::Point point = gtk_util::GetWidgetScreenPosition(parent);
+  gfx::Point point = ui::GetWidgetScreenPosition(parent);
   bounds.Offset(point);
 
   return gfx::Rect(bounds.x(), bounds.y(),