content: Reapply "Start splitting up chrome/browser/ui/gtk/gtk_util.h" (r98287)

chrome/browser/ui/gtk/instant_confirm_dialog_gtk.cc

 // Copyright (c) 2011 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/instant_confirm_dialog_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include "chrome/browser/instant/instant_confirm_dialog.h"
 #include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h"
-#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "googleurl/src/gurl.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
+#include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace browser {
 
 void ShowInstantConfirmDialog(GtkWindow* parent, Profile* profile) {
   new InstantConfirmDialogGtk(parent, profile);
 }
 
 }  // namespace browser
 
 InstantConfirmDialogGtk::InstantConfirmDialogGtk(
     GtkWindow* parent, Profile* profile) : profile_(profile) {
   dialog_ = gtk_dialog_new_with_buttons(
       l10n_util::GetStringUTF8(IDS_INSTANT_OPT_IN_TITLE).c_str(),
       parent,
       static_cast<GtkDialogFlags>(GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR),
       GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
       GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
       NULL);
   g_signal_connect(dialog_, "response", G_CALLBACK(OnResponseThunk), this);
 
   GtkBox* vbox = GTK_BOX(GTK_DIALOG(dialog_)->vbox);
-  gtk_box_set_spacing(vbox, gtk_util::kControlSpacing);
+  gtk_box_set_spacing(vbox, ui::kControlSpacing);
 
   GtkWidget* label = gtk_label_new(
       l10n_util::GetStringUTF8(IDS_INSTANT_OPT_IN_MESSAGE).c_str());
   gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
   gtk_box_pack_start(vbox, label, FALSE, FALSE, 0);
 
   GtkWidget* link_button = gtk_chrome_link_button_new(
       l10n_util::GetStringUTF8(IDS_LEARN_MORE).c_str());
   g_signal_connect(link_button, "clicked",
                    G_CALLBACK(OnLinkButtonClickedThunk), this);
@@ skipping 20 matching lines @@
 }
 
 void InstantConfirmDialogGtk::OnLinkButtonClicked(GtkWidget* button) {
   // We open a new browser window so the Options dialog doesn't get lost behind
   // other windows.
   Browser* browser = Browser::Create(profile_);
   browser->AddSelectedTabWithURL(browser::InstantLearnMoreURL(),
                                  PageTransition::LINK);
   browser->window()->Show();
 }