Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1534)

Unified Diff: chrome/browser/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.cc

Issue 112913004: Update some uses of UTF conversions in chrome/browser to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.cc
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 e119c4228f011622b59529273c36c7bff9d87d3e..903bff4de412b472544b3d11b0feee59468e1195 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
@@ -82,7 +82,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 base::string16 label = UTF8ToUTF16(
+ const base::string16 label = base::UTF8ToUTF16(
ui::EscapeWindowsStyleAccelerators(BuildMenuLabelFor(child)));
// No command id. We override ActivatedAt below to handle activations.
AddItem(kBookmarkItemCommandId, label);
@@ -102,8 +102,8 @@ 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 base::string16 label =
- UTF8ToUTF16(ui::EscapeWindowsStyleAccelerators(BuildMenuLabelFor(node)));
+ const base::string16 label = base::UTF8ToUTF16(
+ ui::EscapeWindowsStyleAccelerators(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_, profile_);

Powered by Google App Engine
This is Rietveld 408576698