Revert "content: Start splitting up chrome/browser/ui/gtk/gtk_util.h"

chrome/browser/ui/gtk/browser_titlebar.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/browser_titlebar.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
 #include <string>
@@ skipping 28 matching lines @@
 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/notification_service.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "grit/ui_resources.h"
-#include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/gtk_util.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/skbitmap_operations.h"
 
 namespace {
 
 // The space above the titlebars.
 const int kTitlebarHeight = 14;
@@ skipping 692 matching lines @@
     // color.
     GdkColor frame_color;
     if (window_has_focus_) {
       frame_color = theme_service_->GetGdkColor(
           ThemeService::COLOR_FRAME);
     } else {
       frame_color = theme_service_->GetGdkColor(
           ThemeService::COLOR_FRAME_INACTIVE);
     }
     GdkColor text_color = PickLuminosityContrastingColor(
-        &frame_color, &ui::kGdkWhite, &ui::kGdkBlack);
+        &frame_color, &gtk_util::kGdkWhite, &gtk_util::kGdkBlack);
     gtk_util::SetLabelColor(app_mode_title_, &text_color);
   } else {
-    gtk_util::SetLabelColor(app_mode_title_, &ui::kGdkWhite);
+    gtk_util::SetLabelColor(app_mode_title_, &gtk_util::kGdkWhite);
   }
 }
 
 void BrowserTitlebar::ShowFaviconMenu(GdkEventButton* event) {
   if (!favicon_menu_model_.get()) {
     favicon_menu_model_.reset(
         new PopupPageMenuModel(this, browser_window_->browser()));
 
     favicon_menu_.reset(new MenuGtk(NULL, favicon_menu_model_.get()));
   }
@@ skipping 272 matching lines @@
     ui::SimpleMenuModel::Delegate* delegate)
     : SimpleMenuModel(delegate) {
   AddItemWithStringId(IDC_NEW_TAB, IDS_TAB_CXMENU_NEWTAB);
   AddItemWithStringId(IDC_RESTORE_TAB, IDS_RESTORE_TAB);
   AddSeparator();
   AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
   AddSeparator();
   AddCheckItemWithStringId(kShowWindowDecorationsCommand,
                            IDS_SHOW_WINDOW_DECORATIONS_MENU);
 }