Move automation/ui_controls to ui/ui_controls

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

 // Copyright (c) 2012 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/ui/gtk/tabs/dragged_view_gtk.h"
 
 #include <gdk/gdk.h>
 
 #include <algorithm>
 
 #include "base/debug/trace_event.h"
 #include "base/i18n/rtl.h"
 #include "base/stl_util.h"
 #include "chrome/browser/extensions/extension_tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/tabs/drag_data.h"
 #include "chrome/browser/ui/gtk/tabs/tab_renderer_gtk.h"
 #include "chrome/browser/ui/gtk/theme_service_gtk.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "third_party/skia/include/core/SkShader.h"
-#include "ui/base/gtk/gtk_screen_utils.h"
+#include "ui/base/gtk/gtk_screen_util.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/gfx/gtk_util.h"
 
 using content::WebContents;
 
 namespace {
 
 // The size of the dragged window frame.
 const int kDragFrameBorderSize = 1;
 const int kTwiceDragFrameBorderSize = 2 * kDragFrameBorderSize;
@@ skipping 429 matching lines @@
     if (!attached_) {
       paint_at = widget_width / kScalingFactor -
           GetWidthInTabStripFromTo(0, index + 1);
     }
   }
 
   cairo_set_source_surface(cr, surface, paint_at, 0);
   cairo_paint(cr);
   cairo_surface_destroy(surface);
 }