chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.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_editor_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

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

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

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

index 2e70f3ccd983ac9d81edefd04dfd620652ac1477..88bd1970898949c5839961f34230869d68fce133 100644

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

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

@@ -343,13 +343,13 @@ void BookmarkEditorGtk::Init(GtkWindow* parent_window) {

std::string title;

GURL url;

if (details_.type == EditDetails::EXISTING_NODE) {

- title = UTF16ToUTF8(details_.existing_node->GetTitle());

+ title = base::UTF16ToUTF8(details_.existing_node->GetTitle());

url = details_.existing_node->url();

} else if (details_.type == EditDetails::NEW_FOLDER) {

title = l10n_util::GetStringUTF8(IDS_BOOKMARK_EDITOR_NEW_FOLDER_NAME);

} else if (details_.type == EditDetails::NEW_URL) {

url = details_.url;

- title = UTF16ToUTF8(details_.title);

+ title = base::UTF16ToUTF8(details_.title);

}

gtk_entry_set_text(GTK_ENTRY(name_entry_), title.c_str());

g_signal_connect(name_entry_, "changed",

@@ -363,7 +363,8 @@ void BookmarkEditorGtk::Init(GtkWindow* parent_window) {

profile_ ? user_prefs::UserPrefs::Get(profile_) : NULL;

gtk_entry_set_text(

GTK_ENTRY(url_entry_),

- UTF16ToUTF8(chrome::FormatBookmarkURLForDisplay(url, prefs)).c_str());

+ base::UTF16ToUTF8(

+ chrome::FormatBookmarkURLForDisplay(url, prefs)).c_str());

g_signal_connect(url_entry_, "changed",

G_CALLBACK(OnEntryChangedThunk), this);

gtk_entry_set_activates_default(GTK_ENTRY(url_entry_), TRUE);

@@ -517,7 +518,7 @@ GURL BookmarkEditorGtk::GetInputURL() const {

}

base::string16 BookmarkEditorGtk::GetInputTitle() const {

- return UTF8ToUTF16(gtk_entry_get_text(GTK_ENTRY(name_entry_)));

+ return base::UTF8ToUTF16(gtk_entry_get_text(GTK_ENTRY(name_entry_)));

}

void BookmarkEditorGtk::ApplyEdits() {