Move automation/ui_controls to ui/ui_controls

chrome/browser/ui/gtk/omnibox/omnibox_popup_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/omnibox/omnibox_popup_view_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include <algorithm>
 #include <string>
@@ skipping 12 matching lines @@
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/theme_service_gtk.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_source.h"
 #include "grit/theme_resources.h"
 #include "ui/base/gtk/gtk_compat.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
+#include "ui/base/gtk/gtk_screen_util.h"
 #include "ui/base/gtk/gtk_windowing.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/gtk_util.h"
 #include "ui/gfx/image/cairo_cached_surface.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/skia_utils_gtk.h"
 
 namespace {
@@ skipping 322 matching lines @@
   }
 
   Show(result.size());
   gtk_widget_queue_draw(window_);
 }
 
 gfx::Rect OmniboxPopupViewGtk::GetTargetBounds() {
   if (!gtk_widget_get_realized(window_))
     return gfx::Rect();
 
-  gfx::Rect retval = gtk_util::GetWidgetScreenBounds(window_);
+  gfx::Rect retval = ui::GetWidgetScreenBounds(window_);
 
   // The widget bounds don't update synchronously so may be out of sync with
   // our last size request.
   GtkRequisition req;
   gtk_widget_size_request(window_, &req);
   retval.set_width(req.width);
   retval.set_height(req.height);
 
   return retval;
 }
@@ skipping 348 matching lines @@
       DrawFullImage(cr, widget,
                     theme_service_->GetImageNamed(
                         is_selected ? IDR_OMNIBOX_TTS_DARK : IDR_OMNIBOX_TTS),
                     icon_start_x, line_rect.y() + kIconTopPadding);
     }
   }
 
   cairo_destroy(cr);
   return TRUE;
 }