diff options
Diffstat (limited to 'ash/system/monitor/tray_monitor.cc')
| -rw-r--r-- | ash/system/monitor/tray_monitor.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/ash/system/monitor/tray_monitor.cc b/ash/system/monitor/tray_monitor.cc index bc3d532..fc87a3a 100644 --- a/ash/system/monitor/tray_monitor.cc +++ b/ash/system/monitor/tray_monitor.cc @@ -65,11 +65,13 @@ void TrayMonitor::OnGotHandles(const std::list<base::ProcessHandle>& handles) { std::string output; base::string16 free_bytes = ui::FormatBytes(static_cast<int64>(mem_info.free) * 1024); - output = base::StringPrintf("free: %s", UTF16ToUTF8(free_bytes).c_str()); + output = base::StringPrintf("free: %s", + base::UTF16ToUTF8(free_bytes).c_str()); #if defined(OS_CHROMEOS) if (mem_info.gem_size != -1) { base::string16 gem_size = ui::FormatBytes(mem_info.gem_size); - output += base::StringPrintf(" gmem: %s", UTF16ToUTF8(gem_size).c_str()); + output += base::StringPrintf(" gmem: %s", + base::UTF16ToUTF8(gem_size).c_str()); if (mem_info.gem_objects != -1) output += base::StringPrintf(" gobjects: %d", mem_info.gem_objects); } @@ -88,9 +90,9 @@ void TrayMonitor::OnGotHandles(const std::list<base::ProcessHandle>& handles) { base::string16 shared_size = ui::FormatBytes(total_shared_bytes); output += base::StringPrintf("\nGPU private: %s shared: %s", - UTF16ToUTF8(private_size).c_str(), - UTF16ToUTF8(shared_size).c_str()); - label_->SetText(UTF8ToUTF16(output)); + base::UTF16ToUTF8(private_size).c_str(), + base::UTF16ToUTF8(shared_size).c_str()); + label_->SetText(base::UTF8ToUTF16(output)); refresh_timer_.Start(FROM_HERE, base::TimeDelta::FromMilliseconds(kRefreshTimeoutMs), this, &TrayMonitor::OnTimer); |