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

Side by Side Diff: ash/system/monitor/tray_monitor.cc

Issue 14949004: ash: Rename tray_views.{h,cc} to tray_utils.{h,cc} (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix browsertest Created 7 years, 7 months 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/system/monitor/tray_monitor.h" 5 #include "ash/system/monitor/tray_monitor.h"
6 6
7 #include "ash/system/tray/tray_item_view.h" 7 #include "ash/system/tray/tray_item_view.h"
8 #include "ash/system/tray/tray_views.h"
9 #include "base/process_util.h" 8 #include "base/process_util.h"
10 #include "base/stringprintf.h" 9 #include "base/stringprintf.h"
11 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
12 #include "content/public/browser/gpu_data_manager.h" 11 #include "content/public/browser/gpu_data_manager.h"
13 #include "ui/base/text/bytes_formatting.h" 12 #include "ui/base/text/bytes_formatting.h"
14 #include "ui/views/controls/label.h" 13 #include "ui/views/controls/label.h"
15 #include "ui/views/border.h" 14 #include "ui/views/border.h"
16 15
17 namespace { 16 namespace {
18 const int kRefreshTimeoutMs = 1000; 17 const int kRefreshTimeoutMs = 1000;
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 UTF16ToUTF8(private_size).c_str(), 88 UTF16ToUTF8(private_size).c_str(),
90 UTF16ToUTF8(shared_size).c_str()); 89 UTF16ToUTF8(shared_size).c_str());
91 label_->SetText(UTF8ToUTF16(output)); 90 label_->SetText(UTF8ToUTF16(output));
92 refresh_timer_.Start(FROM_HERE, 91 refresh_timer_.Start(FROM_HERE,
93 base::TimeDelta::FromMilliseconds(kRefreshTimeoutMs), 92 base::TimeDelta::FromMilliseconds(kRefreshTimeoutMs),
94 this, &TrayMonitor::OnTimer); 93 this, &TrayMonitor::OnTimer);
95 } 94 }
96 95
97 } // namespace internal 96 } // namespace internal
98 } // namespace ash 97 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698