ash/system/date/tray_date.cc - Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1 (Closed)

Patch Set: rebase Created 3 years, 9 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

OLD	NEW
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/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/chromeos/system_clock_observer.h"

9 #include "ash/common/system/date/date_default_view.h"

10 #include "ash/common/system/date/date_view.h"

11 #include "ash/common/system/tray/system_tray.h"

12 #include "ash/common/system/tray/system_tray_notifier.h"

13 #include "ash/common/system/tray/tray_item_view.h"

14 #include "ash/common/wm_shell.h"	8 #include "ash/common/wm_shell.h"

	9 #include "ash/system/date/date_default_view.h"

	10 #include "ash/system/date/date_view.h"

	11 #include "ash/system/system_clock_observer.h"

	12 #include "ash/system/tray/system_tray.h"

	13 #include "ash/system/tray/system_tray_notifier.h"

	14 #include "ash/system/tray/tray_item_view.h"

15	15

16 namespace ash {	16 namespace ash {

17	17

18 TrayDate::TrayDate(SystemTray* system_tray)	18 TrayDate::TrayDate(SystemTray* system_tray)

19 : SystemTrayItem(system_tray, UMA_DATE),	19 : SystemTrayItem(system_tray, UMA_DATE),

20 time_tray_(NULL),	20 time_tray_(NULL),

21 default_view_(NULL),	21 default_view_(NULL),

22 login_status_(LoginStatus::NOT_LOGGED_IN),	22 login_status_(LoginStatus::NOT_LOGGED_IN),

23 system_clock_observer_(new SystemClockObserver()) {	23 system_clock_observer_(new SystemClockObserver()) {

24 WmShell::Get()->system_tray_notifier()->AddClockObserver(this);	24 WmShell::Get()->system_tray_notifier()->AddClockObserver(this);

(...skipping 92 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
117 : tray::DateView::DateAction::NONE);	117 : tray::DateView::DateAction::NONE);

118 }	118 }

119 }	119 }

120	120

121 void TrayDate::Refresh() {	121 void TrayDate::Refresh() {

122 if (time_tray_)	122 if (time_tray_)

123 time_tray_->UpdateText();	123 time_tray_->UpdateText();

124 }	124 }

125	125

126 } // namespace ash	126 } // namespace ash

OLD	NEW

« no previous file with comments | « ash/system/date/tray_date.h ('k') | ash/system/date/tray_system_info.h » ('j') | no next file with comments »