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

Unified Diff: chrome/browser/task_manager/task_manager.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/task_manager/task_manager.cc
diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc
index e04211c21759e2cde081005749b522eaa2d112a7..8ceb7783d05981370f624896496dfd8f9a9dbfeb 100644
--- a/chrome/browser/task_manager/task_manager.cc
+++ b/chrome/browser/task_manager/task_manager.cc
@@ -403,14 +403,14 @@ base::string16 TaskManagerModel::GetResourceNetworkUsage(int index) const {
if (net_usage == -1)
return l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT);
if (net_usage == 0)
- return ASCIIToUTF16("0");
+ return base::ASCIIToUTF16("0");
base::string16 net_byte = ui::FormatSpeed(net_usage);
// Force number string to have LTR directionality.
return base::i18n::GetDisplayStringInLTRDirectionality(net_byte);
}
base::string16 TaskManagerModel::GetResourceCPUUsage(int index) const {
- return UTF8ToUTF16(base::StringPrintf(
+ return base::UTF8ToUTF16(base::StringPrintf(
#if defined(OS_MACOSX)
// Activity Monitor shows %cpu with one decimal digit -- be
// consistent with that.
@@ -424,14 +424,14 @@ base::string16 TaskManagerModel::GetResourceCPUUsage(int index) const {
base::string16 TaskManagerModel::GetResourcePrivateMemory(int index) const {
size_t private_mem;
if (!GetPrivateMemory(index, &private_mem))
- return ASCIIToUTF16("N/A");
+ return base::ASCIIToUTF16("N/A");
return GetMemCellText(private_mem);
}
base::string16 TaskManagerModel::GetResourceSharedMemory(int index) const {
size_t shared_mem;
if (!GetSharedMemory(index, &shared_mem))
- return ASCIIToUTF16("N/A");
+ return base::ASCIIToUTF16("N/A");
return GetMemCellText(shared_mem);
}
@@ -485,9 +485,9 @@ base::string16 TaskManagerModel::GetResourceVideoMemory(int index) const {
size_t video_memory;
bool has_duplicates;
if (!GetVideoMemory(index, &video_memory, &has_duplicates) || !video_memory)
- return ASCIIToUTF16("N/A");
+ return base::ASCIIToUTF16("N/A");
if (has_duplicates) {
- return GetMemCellText(video_memory) + ASCIIToUTF16("*");
+ return GetMemCellText(video_memory) + base::ASCIIToUTF16("*");
}
return GetMemCellText(video_memory);
}
@@ -497,7 +497,7 @@ base::string16 TaskManagerModel::GetResourceFPS(
float fps = 0;
if (!GetFPS(index, &fps))
return l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT);
- return UTF8ToUTF16(base::StringPrintf("%.0f", fps));
+ return base::UTF8ToUTF16(base::StringPrintf("%.0f", fps));
}
base::string16 TaskManagerModel::GetResourceSqliteMemoryUsed(int index) const {

Powered by Google App Engine
This is Rietveld 408576698