linux: Move linux_util.h from gfx/ to ui/base/gtk.

chrome/browser/ui/gtk/global_menu_bar.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/global_menu_bar.h"
 
 #include <gtk/gtk.h>
 
 #include "base/command_line.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/gtk/accelerators_gtk.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "grit/generated_resources.h"
+#include "ui/base/gtk/menu_label_accelerator_util.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/gfx/linux_util.h"
 
 struct GlobalMenuBarCommand {
   int str_id;
   int command;
   int tag;
 };
 
 namespace {
 
 const int MENU_SEPARATOR =-1;
@@ skipping 183 matching lines @@
   for (int i = 0; commands[i].str_id != MENU_END; ++i) {
     GtkWidget* menu_item = BuildMenuItem(
         commands[i].str_id, commands[i].command, commands[i].tag,
         id_to_menu_item, menu);
     gtk_menu_shell_append(GTK_MENU_SHELL(menu), menu_item);
   }
 
   gtk_widget_show(menu);
 
   GtkWidget* menu_item = gtk_menu_item_new_with_mnemonic(
-      gfx::RemoveWindowsStyleAccelerators(
+      ui::RemoveWindowsStyleAccelerators(
           l10n_util::GetStringUTF8(menu_str_id)).c_str());
 
   // Give the owner a chance to sink the reference before we add it to the menu
   // bar.
   if (owner)
     owner->Init(menu, menu_item);
 
   gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_item), menu);
   gtk_widget_show(menu_item);
   gtk_menu_shell_append(GTK_MENU_SHELL(menu_bar_.get()), menu_item);
 }
 
 GtkWidget* GlobalMenuBar::BuildMenuItem(
     int string_id,
     int command_id,
     int tag_id,
     std::map<int, GtkWidget*>* id_to_menu_item,
     GtkWidget* menu_to_add_to) {
   GtkWidget* menu_item = NULL;
   if (string_id == MENU_SEPARATOR) {
     menu_item = gtk_separator_menu_item_new();
   } else {
-    std::string label =
-        gfx::ConvertAcceleratorsFromWindowsStyle(
-            l10n_util::GetStringUTF8(string_id));
+    std::string label = ui::ConvertAcceleratorsFromWindowsStyle(
+        l10n_util::GetStringUTF8(string_id));
 
     if (command_id == IDC_SHOW_BOOKMARK_BAR)
       menu_item = gtk_check_menu_item_new_with_mnemonic(label.c_str());
     else
       menu_item = gtk_menu_item_new_with_mnemonic(label.c_str());
 
     if (tag_id) {
       g_object_set_data(G_OBJECT(menu_item), "type-tag",
                         GINT_TO_POINTER(tag_id));
     }
@@ skipping 40 matching lines @@
   }
 }
 
 void GlobalMenuBar::OnItemActivated(GtkWidget* sender) {
   if (block_activation_)
     return;
 
   int id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(sender), "command-id"));
   browser_->ExecuteCommandIfEnabled(id);
 }