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

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

Issue 2455183002: Simplify layout of tray items and fix spacing for MD. (Closed)
Patch Set: tda review Created 4 years, 1 month 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/date/date_view.cc ('k') | ash/common/system/tray/fixed_sized_image_view.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_COMMON_SYSTEM_DATE_TRAY_DATE_H_ 5 #ifndef ASH_COMMON_SYSTEM_DATE_TRAY_DATE_H_
6 #define ASH_COMMON_SYSTEM_DATE_TRAY_DATE_H_ 6 #define ASH_COMMON_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"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 void DestroyDetailedView() override; 61 void DestroyDetailedView() override;
62 void UpdateAfterLoginStatusChange(LoginStatus status) override; 62 void UpdateAfterLoginStatusChange(LoginStatus status) override;
63 void UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) override; 63 void UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) override;
64 64
65 // Overridden from ClockObserver. 65 // Overridden from ClockObserver.
66 void OnDateFormatChanged() override; 66 void OnDateFormatChanged() override;
67 void OnSystemClockTimeUpdated() override; 67 void OnSystemClockTimeUpdated() override;
68 void OnSystemClockCanSetTimeChanged(bool can_set_time) override; 68 void OnSystemClockCanSetTimeChanged(bool can_set_time) override;
69 void Refresh() override; 69 void Refresh() override;
70 70
71 void SetupLabelForTimeTray(views::Label* label);
72
73 tray::TimeView* time_tray_; 71 tray::TimeView* time_tray_;
74 DateDefaultView* default_view_; 72 DateDefaultView* default_view_;
75 LoginStatus login_status_; 73 LoginStatus login_status_;
76 74
77 #if defined(OS_CHROMEOS) 75 #if defined(OS_CHROMEOS)
78 std::unique_ptr<SystemClockObserver> system_clock_observer_; 76 std::unique_ptr<SystemClockObserver> system_clock_observer_;
79 #endif 77 #endif
80 78
81 DISALLOW_COPY_AND_ASSIGN(TrayDate); 79 DISALLOW_COPY_AND_ASSIGN(TrayDate);
82 }; 80 };
83 81
84 } // namespace ash 82 } // namespace ash
85 83
86 #endif // ASH_COMMON_SYSTEM_DATE_TRAY_DATE_H_ 84 #endif // ASH_COMMON_SYSTEM_DATE_TRAY_DATE_H_
OLDNEW
« no previous file with comments | « ash/common/system/date/date_view.cc ('k') | ash/common/system/tray/fixed_sized_image_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698