Move automation/ui_controls to ui/ui_controls

chrome/browser/ui/gtk/download/download_shelf_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/download/download_shelf_gtk.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
 #include "chrome/browser/ui/gtk/custom_button.h"
 #include "chrome/browser/ui/gtk/download/download_item_gtk.h"
 #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h"
 #include "chrome/browser/ui/gtk/gtk_chrome_shrinkable_hbox.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/theme_service_gtk.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/notification_source.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "grit/ui_resources_standard.h"
+#include "ui/base/gtk/gtk_screen_util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/gtk_util.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 
 namespace {
 
@@ skipping 328 matching lines @@
     MouseEnteredShelf();
   else
     MouseLeftShelf();
 }
 
 bool DownloadShelfGtk::IsCursorInShelfZone(
     const gfx::Point& cursor_screen_coords) {
   GtkAllocation allocation;
   gtk_widget_get_allocation(shelf_.get(), &allocation);
 
-  gfx::Rect bounds(gtk_util::GetWidgetScreenPosition(shelf_.get()),
+  gfx::Rect bounds(ui::GetWidgetScreenPosition(shelf_.get()),
                    gfx::Size(allocation.width, allocation.height));
 
   // Negative insets expand the rectangle. We only expand the top.
   bounds.Inset(gfx::Insets(-kShelfAuraSize, 0, 0, 0));
 
   return bounds.Contains(cursor_screen_coords);
 }
 
 void DownloadShelfGtk::MouseLeftShelf() {
   DCHECK(close_on_mouse_out_);
 
   MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&DownloadShelfGtk::Close, weak_factory_.GetWeakPtr()),
       base::TimeDelta::FromMilliseconds(kAutoCloseDelayMs));
 }
 
 void DownloadShelfGtk::MouseEnteredShelf() {
   weak_factory_.InvalidateWeakPtrs();
 }