Move automation/ui_controls to ui/ui_controls

chrome/browser/ui/gtk/confirm_bubble_view.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/confirm_bubble_view.h"
 
 #include <gtk/gtk.h>
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/confirm_bubble_model.h"
 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
 #include "chrome/browser/ui/gtk/custom_button.h"
 #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/theme_service_gtk.h"
 #include "grit/theme_resources.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
+#include "ui/base/gtk/gtk_screen_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 
 namespace {
 
 // Padding between content and edge of bubble.
 const int kContentBorder = 7;
 
 // Horizontal spacing between the image view and the label.
 const int kImageViewSpacing = 5;
@@ skipping 99 matching lines @@
     if (has_ok_button) {
       GtkWidget* ok_button = gtk_button_new_with_label(UTF16ToUTF8(
           model_->GetButtonLabel(ConfirmBubbleModel::BUTTON_OK)).c_str());
       g_signal_connect(ok_button, "clicked", G_CALLBACK(OnOkButtonThunk), this);
       gtk_box_pack_start(GTK_BOX(row), ok_button, FALSE, FALSE, 0);
     }
     gtk_box_pack_start(GTK_BOX(content), row, FALSE, FALSE, 0);
   }
 
   // Show a bubble consisting of the above widgets under the anchor point.
-  gfx::Rect rect = gtk_util::GetWidgetScreenBounds(anchor_);
+  gfx::Rect rect = ui::GetWidgetScreenBounds(anchor_);
   rect.set_x(anchor_point_.x() - rect.x());
   rect.set_y(anchor_point_.y() - rect.y());
   rect.set_width(0);
   rect.set_height(0);
   bubble_ = BubbleGtk::Show(anchor_,
                             &rect,
                             content,
                             BubbleGtk::ARROW_LOCATION_NONE,
                             true,  // match_system_theme
                             true,  // grab_input
@@ skipping 24 matching lines @@
   // click this button. We should ask the model if we can close this view.
   bubble_->Close();
 }
 
 void ConfirmBubbleView::OnLinkButton(GtkWidget* sender) {
   model_->LinkClicked();
   // TODO(hbono): this code prevents the model from updating this view when we
   // click this link. We should ask the model if we can close this view.
   bubble_->Close();
 }