chrome/browser/ui/gtk/bookmarks/bookmark_tree_model.cc - Issue 112913004: Update some uses of UTF conversions in chrome/browser to use the base:: namespace.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/gtk/bookmarks/bookmark_tree_model.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

« no previous file with comments | « chrome/browser/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.cc ('k') | chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/gtk/bookmarks/bookmark_tree_model.cc

diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_tree_model.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_tree_model.cc

index 6c5538826d866c20c59774599b33e0b27019f621..93fbe6ada25d244ee79302d919df97f4e4606284 100644

--- a/chrome/browser/ui/gtk/bookmarks/bookmark_tree_model.cc

+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_tree_model.cc

@@ -30,7 +30,7 @@ void AddSingleNodeToTreeStore(GtkTreeStore* store, const BookmarkNode* node,

FOLDER_ICON,

GtkThemeService::GetFolderIcon(true).ToGdkPixbuf(),

FOLDER_NAME,

- UTF16ToUTF8(node->GetTitle()).c_str(),

+ base::UTF16ToUTF8(node->GetTitle()).c_str(),

ITEM_ID,

node->id(),

// We don't want to use node->is_folder() because that

@@ -233,7 +233,7 @@ base::string16 GetTitleFromTreeIter(GtkTreeModel* model, GtkTreeIter* iter) {

gtk_tree_model_get_value(model, iter, FOLDER_NAME, &value);

if (G_VALUE_HOLDS_STRING(&value)) {

const gchar* utf8str = g_value_get_string(&value);

- ret_val = UTF8ToUTF16(utf8str);

+ ret_val = base::UTF8ToUTF16(utf8str);

g_value_unset(&value);

} else {

NOTREACHED() << "Impossible type mismatch";