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

chrome/browser/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.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/bookmarks/bookmark_sub_menu_model_gtk.h"
 
 #include "base/stl_util.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/event_disposition.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.h"
 #include "chrome/browser/ui/gtk/menu_gtk.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"
 
 using content::OpenURLParams;
 using content::PageNavigator;
 
 // Per chrome/app/chrome_command_ids.h, values < 4000 are for "dynamic menu
 // items". We only use one command id for all the bookmarks, because we handle
 // bookmark item activations directly. So we pick a suitably large random value
 // and use that to avoid accidental conflicts with other dynamic items.
 static const int kBookmarkItemCommandId = 1759;
 
@@ skipping 38 matching lines @@
 void BookmarkNodeMenuModel::PopulateMenu() {
   DCHECK(submenus_.empty());
   for (int i = 0; i < node_->child_count(); ++i) {
     const BookmarkNode* child = node_->GetChild(i);
     if (child->is_folder()) {
       AddSubMenuForNode(child);
     } else {
       // Ironically the label will end up getting converted back to UTF8 later.
       // We need to escape any Windows-style "&" characters since they will be
       // converted in MenuGtk outside of our control here.
-      const string16 label = UTF8ToUTF16(gfx::EscapeWindowsStyleAccelerators(
+      const string16 label = UTF8ToUTF16(ui::EscapeWindowsStyleAccelerators(
           bookmark_utils::BuildMenuLabelFor(child)));
       // No command id. We override ActivatedAt below to handle activations.
       AddItem(kBookmarkItemCommandId, label);
       const SkBitmap& node_icon = model_->GetFavicon(child);
       if (node_icon.width() > 0)
         SetIcon(GetItemCount() - 1, node_icon);
       // TODO(mdm): set up an observer to watch for icon load events and set
       // the icons in response.
     }
   }
 }
 
 void BookmarkNodeMenuModel::AddSubMenuForNode(const BookmarkNode* node) {
   DCHECK(node->is_folder());
   // Ironically the label will end up getting converted back to UTF8 later.
   // We need to escape any Windows-style "&" characters since they will be
   // converted in MenuGtk outside of our control here.
-  const string16 label = UTF8ToUTF16(gfx::EscapeWindowsStyleAccelerators(
+  const string16 label = UTF8ToUTF16(ui::EscapeWindowsStyleAccelerators(
       bookmark_utils::BuildMenuLabelFor(node)));
   // Don't pass in the delegate, if any. Bookmark submenus don't need one.
   BookmarkNodeMenuModel* submenu =
       new BookmarkNodeMenuModel(NULL, model_, node, page_navigator_);
   // No command id. Nothing happens if you click on the submenu itself.
   AddSubMenu(kBookmarkItemCommandId, label, submenu);
   submenus_.push_back(submenu);
 }
 
 void BookmarkNodeMenuModel::NavigateToMenuItem(
@@ skipping 113 matching lines @@
 
 bool BookmarkSubMenuModel::IsVisibleAt(int index) const {
   // We don't want the delegate interfering with bookmark items.
   return index >= fixed_items_ || SimpleMenuModel::IsVisibleAt(index);
 }
 
 // static
 bool BookmarkSubMenuModel::IsBookmarkItemCommandId(int command_id) {
   return command_id == kBookmarkItemCommandId;
 }