| Index: chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc
|
| diff --git a/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc b/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc
|
| index 304972b4f9938831bc06dc1fc5cfb5df810f5075..22969b9a9e5760bea3e098919d2dc40e1fea1f10 100644
|
| --- a/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc
|
| +++ b/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc
|
| @@ -43,11 +43,11 @@
|
| #include "ui/base/dragdrop/gtk_dnd_util.h"
|
| #include "ui/base/gtk/gtk_compat.h"
|
| #include "ui/base/gtk/gtk_hig_constants.h"
|
| +#include "ui/base/gtk/menu_label_accelerator_util.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
| #include "ui/gfx/color_utils.h"
|
| #include "ui/gfx/font.h"
|
| -#include "ui/gfx/linux_util.h"
|
| #include "ui/gfx/skia_utils_gtk.h"
|
|
|
| using content::WebContents;
|
| @@ -1309,7 +1309,7 @@ void OmniboxViewGtk::HandlePopulatePopup(GtkWidget* sender, GtkMenu* menu) {
|
|
|
| // Search Engine menu item.
|
| GtkWidget* search_engine_menuitem = gtk_menu_item_new_with_mnemonic(
|
| - gfx::ConvertAcceleratorsFromWindowsStyle(
|
| + ui::ConvertAcceleratorsFromWindowsStyle(
|
| l10n_util::GetStringUTF8(IDS_EDIT_SEARCH_ENGINES)).c_str());
|
| gtk_menu_shell_append(GTK_MENU_SHELL(menu), search_engine_menuitem);
|
| g_signal_connect(search_engine_menuitem, "activate",
|
| @@ -1333,7 +1333,7 @@ void OmniboxViewGtk::HandlePopulatePopup(GtkWidget* sender, GtkMenu* menu) {
|
| // before is_paste_and_search() in order to set up the paste-and-go state.
|
| bool can_paste_and_go = model_->CanPasteAndGo(sanitized_text);
|
| GtkWidget* paste_go_menuitem = gtk_menu_item_new_with_mnemonic(
|
| - gfx::ConvertAcceleratorsFromWindowsStyle(
|
| + ui::ConvertAcceleratorsFromWindowsStyle(
|
| l10n_util::GetStringUTF8(model_->is_paste_and_search() ?
|
| IDS_PASTE_AND_SEARCH : IDS_PASTE_AND_GO)).c_str());
|
|
|
|
|