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

chrome/browser/ui/gtk/infobars/after_translate_infobar_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/infobars/after_translate_infobar_gtk.h"
 
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/translate/translate_infobar_delegate.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "grit/generated_resources.h"
+#include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 
 AfterTranslateInfoBar::AfterTranslateInfoBar(
     TabContentsWrapper* owner,
     TranslateInfoBarDelegate* delegate)
     : TranslateInfoBarBase(owner, delegate),
       ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
 }
 
 AfterTranslateInfoBar::~AfterTranslateInfoBar() {
 }
 
 void AfterTranslateInfoBar::Init() {
   TranslateInfoBarBase::Init();
 
   bool swapped_language_combos = false;
   std::vector<string16> strings;
   TranslateInfoBarDelegate::GetAfterTranslateStrings(
       &strings, &swapped_language_combos);
   DCHECK(strings.size() == 3U);
 
-  GtkWidget* hbox = gtk_hbox_new(FALSE, gtk_util::kControlSpacing);
+  GtkWidget* hbox = gtk_hbox_new(FALSE, ui::kControlSpacing);
   gtk_util::CenterWidgetInHBox(hbox_, hbox, false, 0);
 
   GtkWidget* original_lang_combo =
       CreateLanguageCombobox(GetDelegate()->original_language_index(),
                              GetDelegate()->target_language_index());
   g_signal_connect(original_lang_combo, "changed",
                    G_CALLBACK(&OnOriginalLanguageModifiedThunk), this);
   GtkWidget* target_lang_combo =
       CreateLanguageCombobox(GetDelegate()->target_language_index(),
                              GetDelegate()->original_language_index());
@@ skipping 51 matching lines @@
   GetDelegate()->RevertTranslation();
 }
 
 void AfterTranslateInfoBar::SetOriginalLanguage(size_t language_index) {
   GetDelegate()->SetOriginalLanguage(language_index);
 }
 
 void AfterTranslateInfoBar::SetTargetLanguage(size_t language_index) {
   GetDelegate()->SetTargetLanguage(language_index);
 }