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

chrome/browser/ui/gtk/constrained_html_delegate_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/webui/constrained_html_ui.h"
 
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/gtk/constrained_window_gtk.h"
-#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/tab_contents_container_gtk.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/webui/html_dialog_tab_contents_delegate.h"
 #include "chrome/browser/ui/webui/html_dialog_ui.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/notification_source.h"
+#include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/gfx/rect.h"
 
 class ConstrainedHtmlDelegateGtk : public ConstrainedWindowGtkDelegate,
                                    public HtmlDialogTabContentsDelegate,
                                    public ConstrainedHtmlUIDelegate {
  public:
   ConstrainedHtmlDelegateGtk(Profile* profile,
                              HtmlDialogUIDelegate* delegate);
 
   virtual ~ConstrainedHtmlDelegateGtk();
 
   // ConstrainedWindowGtkDelegate ----------------------------------------------
   virtual GtkWidget* GetWidgetRoot() {
     return tab_contents_container_.widget();
   }
   virtual GtkWidget* GetFocusWidget() {
     return tab_.tab_contents()->GetContentNativeView();
   }
   virtual void DeleteDelegate() {
     html_delegate_->OnWindowClosed();
     html_delegate_->OnDialogClosed("");
     delete this;
   }
 
   // ConstrainedHtmlDelegate ---------------------------------------------
   virtual HtmlDialogUIDelegate* GetHtmlDialogUIDelegate();
   virtual void OnDialogClose();
   virtual bool GetBackgroundColor(GdkColor* color) {
-    *color = gtk_util::kGdkWhite;
+    *color = ui::kGdkWhite;
     return true;
   }
 
   // HtmlDialogTabContentsDelegate ---------------------------------------------
   void HandleKeyboardEvent(const NativeWebKeyboardEvent& event) {}
 
   void set_window(ConstrainedWindow* window) {
     window_ = window;
   }
 
@@ skipping 52 matching lines @@
     Profile* profile,
     HtmlDialogUIDelegate* delegate,
     TabContents* overshadowed) {
   ConstrainedHtmlDelegateGtk* constrained_delegate =
       new ConstrainedHtmlDelegateGtk(profile, delegate);
   ConstrainedWindow* constrained_window =
       new ConstrainedWindowGtk(overshadowed, constrained_delegate);
   constrained_delegate->set_window(constrained_window);
   return constrained_window;
 }