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

Unified Diff: chrome/browser/shell_integration_linux.cc

Issue 120983002: 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/shell_integration_linux.cc
diff --git a/chrome/browser/shell_integration_linux.cc b/chrome/browser/shell_integration_linux.cc
index eb4d9990350ad774038b7817a7ac4da0c682f82c..16725ca7cc0631a8ad68bc75d9c7e1722002c4a5 100644
--- a/chrome/browser/shell_integration_linux.cc
+++ b/chrome/browser/shell_integration_linux.cc
@@ -736,7 +736,7 @@ std::string GetDesktopFileContents(
g_key_file_set_string(key_file, kDesktopEntry, "Type", "Application");
// Set the "Name" key.
- std::string final_title = UTF16ToUTF8(title);
+ std::string final_title = base::UTF16ToUTF8(title);
// Make sure no endline characters can slip in and possibly introduce
// additional lines (like Exec, which makes it a security risk). Also
// use the URL as a default when the title is empty.
@@ -806,7 +806,7 @@ std::string GetDirectoryFileContents(const base::string16& title,
g_key_file_set_string(key_file, kDesktopEntry, "Version", "1.0");
g_key_file_set_string(key_file, kDesktopEntry, "Type", "Directory");
- std::string final_title = UTF16ToUTF8(title);
+ std::string final_title = base::UTF16ToUTF8(title);
g_key_file_set_string(key_file, kDesktopEntry, "Name", final_title.c_str());
if (!icon_name.empty()) {
g_key_file_set_string(key_file, kDesktopEntry, "Icon", icon_name.c_str());
« no previous file with comments | « chrome/browser/sessions/tab_restore_browsertest.cc ('k') | chrome/browser/shell_integration_linux_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698