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

Side by Side Diff: ash/common/system/date/tray_date.cc

Issue 2148593004: mash: Move StatusTray and StatusAreaWidget to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@traydisplay
Patch Set: rebase Created 4 years, 5 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
« no previous file with comments | « ash/common/system/chromeos/tray_tracing.cc ('k') | ash/common/system/ime/tray_ime_chromeos.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/common/system/date/tray_date.h" 5 #include "ash/common/system/date/tray_date.h"
6 6
7 #include "ash/common/shelf/wm_shelf_util.h" 7 #include "ash/common/shelf/wm_shelf_util.h"
8 #include "ash/common/system/date/date_default_view.h" 8 #include "ash/common/system/date/date_default_view.h"
9 #include "ash/common/system/date/date_view.h" 9 #include "ash/common/system/date/date_view.h"
10 #include "ash/common/system/tray/system_tray.h"
10 #include "ash/common/system/tray/system_tray_notifier.h" 11 #include "ash/common/system/tray/system_tray_notifier.h"
11 #include "ash/common/system/tray/tray_item_view.h" 12 #include "ash/common/system/tray/tray_item_view.h"
12 #include "ash/common/wm_shell.h" 13 #include "ash/common/wm_shell.h"
13 #include "ash/system/tray/system_tray.h"
14 14
15 #if defined(OS_CHROMEOS) 15 #if defined(OS_CHROMEOS)
16 #include "ash/common/system/chromeos/system_clock_observer.h" 16 #include "ash/common/system/chromeos/system_clock_observer.h"
17 #endif 17 #endif
18 18
19 namespace ash { 19 namespace ash {
20 20
21 TrayDate::TrayDate(SystemTray* system_tray) 21 TrayDate::TrayDate(SystemTray* system_tray)
22 : SystemTrayItem(system_tray), 22 : SystemTrayItem(system_tray),
23 time_tray_(NULL), 23 time_tray_(NULL),
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 can_set_time ? TrayDate::SET_SYSTEM_TIME : TrayDate::NONE); 121 can_set_time ? TrayDate::SET_SYSTEM_TIME : TrayDate::NONE);
122 } 122 }
123 } 123 }
124 124
125 void TrayDate::Refresh() { 125 void TrayDate::Refresh() {
126 if (time_tray_) 126 if (time_tray_)
127 time_tray_->UpdateText(); 127 time_tray_->UpdateText();
128 } 128 }
129 129
130 } // namespace ash 130 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/system/chromeos/tray_tracing.cc ('k') | ash/common/system/ime/tray_ime_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698