Move automation/ui_controls to ui/ui_controls

chrome/browser/ui/gtk/gtk_util.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/gtk_util.h"
 
 #include <cairo/cairo.h>
 
 #include <algorithm>
 #include <cstdarg>
@@ skipping 18 matching lines @@
 #include "chrome/browser/ui/gtk/theme_service_gtk.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/renderer_preferences.h"
 #include "googleurl/src/gurl.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "ui/base/events.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/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/text/text_elider.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/gfx/gtk_util.h"
 #include "ui/gfx/image/cairo_cached_surface.h"
 #include "ui/gfx/image/image.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/frame/browser_view.h"
@@ skipping 488 matching lines @@
   pango_font_description_set_absolute_size(font_desc,
                                            PANGO_SCALE * size_pixels);
   gtk_widget_modify_font(widget, font_desc);
   pango_font_description_free(font_desc);
 }
 
 void UndoForceFontSize(GtkWidget* widget) {
   gtk_widget_modify_font(widget, NULL);
 }
 
-gfx::Point GetWidgetScreenPosition(GtkWidget* widget) {
-  GdkWindow* window = gtk_widget_get_window(widget);
-
-  if (!window) {
-    NOTREACHED() << "Must only be called on realized widgets.";
-    return gfx::Point(0, 0);
-  }
-
-  gint x, y;
-  gdk_window_get_origin(window, &x, &y);
-
-  if (!gtk_widget_get_has_window(widget)) {
-    GtkAllocation allocation;
-    gtk_widget_get_allocation(widget, &allocation);
-    x += allocation.x;
-    y += allocation.y;
-  }
-
-  return gfx::Point(x, y);
-}
-
-gfx::Rect GetWidgetScreenBounds(GtkWidget* widget) {
-  gfx::Point position = GetWidgetScreenPosition(widget);
-
-  GtkAllocation allocation;
-  gtk_widget_get_allocation(widget, &allocation);
-
-  return gfx::Rect(position.x(), position.y(),
-                   allocation.width, allocation.height);
-}
-
 gfx::Size GetWidgetSize(GtkWidget* widget) {
   GtkRequisition size;
   gtk_widget_size_request(widget, &size);
   return gfx::Size(size.width, size.height);
 }
 
 void ConvertWidgetPointToScreen(GtkWidget* widget, gfx::Point* p) {
   DCHECK(widget);
   DCHECK(p);
 
-  gfx::Point position = GetWidgetScreenPosition(widget);
+  gfx::Point position = ui::GetWidgetScreenPosition(widget);
   p->SetPoint(p->x() + position.x(), p->y() + position.y());
 }
 
 GtkWidget* CenterWidgetInHBox(GtkWidget* hbox, GtkWidget* widget,
                               bool pack_at_end, int padding) {
   GtkWidget* centering_vbox = gtk_vbox_new(FALSE, 0);
   gtk_box_pack_start(GTK_BOX(centering_vbox), widget, TRUE, FALSE, 0);
   if (pack_at_end)
     gtk_box_pack_end(GTK_BOX(hbox), centering_vbox, FALSE, FALSE, padding);
   else
@@ skipping 723 matching lines @@
 
 void DoCopy(BrowserWindow* window) {
   DoCutCopyPaste(window, &RenderWidgetHost::Copy, "copy-clipboard");
 }
 
 void DoPaste(BrowserWindow* window) {
   DoCutCopyPaste(window, &RenderWidgetHost::Paste, "paste-clipboard");
 }
 
 }  // namespace gtk_util