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

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

Issue 2064953002: mash: Migrate tray date view to //ash/common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@trayviews
Patch Set: review feedback Created 4 years, 6 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/system/date/date_view.cc ('k') | ash/system/date/tray_date.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 #ifndef ASH_SYSTEM_DATE_TRAY_DATE_H_ 5 #ifndef ASH_SYSTEM_DATE_TRAY_DATE_H_
6 #define ASH_SYSTEM_DATE_TRAY_DATE_H_ 6 #define ASH_SYSTEM_DATE_TRAY_DATE_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
11 #include "ash/common/login_status.h"
12 #include "ash/common/system/date/clock_observer.h"
11 #include "ash/common/system/tray/system_tray_item.h" 13 #include "ash/common/system/tray/system_tray_item.h"
12 #include "ash/system/date/clock_observer.h"
13 #include "base/macros.h" 14 #include "base/macros.h"
14 15
15 namespace views { 16 namespace views {
16 class Label; 17 class Label;
17 } 18 }
18 19
19 namespace ash { 20 namespace ash {
20 class DateDefaultView; 21 class DateDefaultView;
21 #if defined(OS_CHROMEOS) 22 #if defined(OS_CHROMEOS)
22 class SystemClockObserver; 23 class SystemClockObserver;
23 #endif 24 #endif
24 25
25 namespace tray { 26 namespace tray {
26 class TimeView; 27 class TimeView;
27 } 28 }
28 29
30 // System tray item for the time and date.
29 class ASH_EXPORT TrayDate : public SystemTrayItem, public ClockObserver { 31 class ASH_EXPORT TrayDate : public SystemTrayItem, public ClockObserver {
30 public: 32 public:
31 enum ClockLayout { 33 enum ClockLayout {
32 HORIZONTAL_CLOCK, 34 HORIZONTAL_CLOCK,
33 VERTICAL_CLOCK, 35 VERTICAL_CLOCK,
34 }; 36 };
35 37
36 enum DateAction { 38 enum DateAction {
37 NONE, 39 NONE,
38 SET_SYSTEM_TIME, 40 SET_SYSTEM_TIME,
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 #if defined(OS_CHROMEOS) 77 #if defined(OS_CHROMEOS)
76 std::unique_ptr<SystemClockObserver> system_clock_observer_; 78 std::unique_ptr<SystemClockObserver> system_clock_observer_;
77 #endif 79 #endif
78 80
79 DISALLOW_COPY_AND_ASSIGN(TrayDate); 81 DISALLOW_COPY_AND_ASSIGN(TrayDate);
80 }; 82 };
81 83
82 } // namespace ash 84 } // namespace ash
83 85
84 #endif // ASH_SYSTEM_DATE_TRAY_DATE_H_ 86 #endif // ASH_SYSTEM_DATE_TRAY_DATE_H_
OLDNEW
« no previous file with comments | « ash/system/date/date_view.cc ('k') | ash/system/date/tray_date.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698