diff options
author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-23 18:35:42 +0000 |
---|---|---|
committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-23 18:35:42 +0000 |
commit | 4f260d0c40e2b63d2af72d667ca5b0518c2dff84 (patch) | |
tree | 2c976dd8b8dc5c217646627205e61728e8891b03 /chrome/browser/memory_details_linux.cc | |
parent | b3ae5db129f88dae153880e84bdabea8ce2ca89b (diff) | |
download | chromium_src-4f260d0c40e2b63d2af72d667ca5b0518c2dff84.zip chromium_src-4f260d0c40e2b63d2af72d667ca5b0518c2dff84.tar.gz chromium_src-4f260d0c40e2b63d2af72d667ca5b0518c2dff84.tar.bz2 |
Update file version info/memory details/process utils to use string16.
BUG=23581
TEST=everything still works
Review URL: http://codereview.chromium.org/5968008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70071 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/memory_details_linux.cc')
-rw-r--r-- | chrome/browser/memory_details_linux.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/memory_details_linux.cc b/chrome/browser/memory_details_linux.cc index 14506c3..a5e58b8 100644 --- a/chrome/browser/memory_details_linux.cc +++ b/chrome/browser/memory_details_linux.cc @@ -240,8 +240,8 @@ void MemoryDetails::CollectProcessData( GetAllChildren(processes, getpid(), zygote, ¤t_browser_processes); ProcessData current_browser; GetProcessDataMemoryInformation(current_browser_processes, ¤t_browser); - current_browser.name = chrome::kBrowserAppName; - current_browser.process_name = L"chrome"; + current_browser.name = WideToUTF16(chrome::kBrowserAppName); + current_browser.process_name = ASCIIToUTF16("chrome"); process_data_.push_back(current_browser); // For each browser process, collect a list of its children and get the @@ -258,7 +258,7 @@ void MemoryDetails::CollectProcessData( if (j->pid == *i) { BrowserType type = GetBrowserType(j->name); if (type != MAX_BROWSERS) - browser.name = ASCIIToWide(kBrowserPrettyNames[type]); + browser.name = ASCIIToUTF16(kBrowserPrettyNames[type]); break; } } |