diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-04 17:51:04 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-04 17:51:04 +0000 |
| commit | 4282bbd4cf1456b958c153fc96e2c12abde7de8f (patch) | |
| tree | 9292bd7aa3b77a9512c2f2ef54f8a1f97492ec56 /chrome/browser/ui/gtk/bookmarks | |
| parent | 9ed9ac97bd45365c2cb491b16f9c70ee96b036ff (diff) | |
| download | chromium_src-4282bbd4cf1456b958c153fc96e2c12abde7de8f.zip chromium_src-4282bbd4cf1456b958c153fc96e2c12abde7de8f.tar.gz chromium_src-4282bbd4cf1456b958c153fc96e2c12abde7de8f.tar.bz2 | |
linux: Move linux_util.h from gfx/ to ui/base/gtk.
The reason for this, is that I don't think this belongs to gfx/ directory. Also rename it to
menu_label_accelerator_util.* to make it clear what the conversion functions are about.
TEST=ui_unittests --gtest_filter=MenuLabelAcceleratorUtilTest*
R=tony@chromium.org
TBR=erg@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10316013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135373 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/gtk/bookmarks')
| -rw-r--r-- | chrome/browser/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.cc index a54211f..1e3bfef 100644 --- a/chrome/browser/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.cc +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.cc @@ -15,8 +15,8 @@ #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; @@ -75,7 +75,7 @@ void BookmarkNodeMenuModel::PopulateMenu() { // 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); @@ -93,7 +93,7 @@ void BookmarkNodeMenuModel::AddSubMenuForNode(const BookmarkNode* node) { // 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 = |