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

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

Issue 2807693002: Make LogoutButtonTray a regular View (Closed)
Patch Set: Rebased Created 3 years, 8 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/shelf/shelf_widget.cc ('k') | ash/system/date/tray_system_info.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_SYSTEM_INFO_H_ 5 #ifndef ASH_SYSTEM_DATE_TRAY_SYSTEM_INFO_H_
6 #define ASH_SYSTEM_DATE_TRAY_SYSTEM_INFO_H_ 6 #define ASH_SYSTEM_DATE_TRAY_SYSTEM_INFO_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
(...skipping 24 matching lines...) Expand all
35 const tray::TimeView* GetTimeTrayForTesting() const; 35 const tray::TimeView* GetTimeTrayForTesting() const;
36 const SystemInfoDefaultView* GetDefaultViewForTesting() const; 36 const SystemInfoDefaultView* GetDefaultViewForTesting() const;
37 views::View* CreateDefaultViewForTesting(LoginStatus status); 37 views::View* CreateDefaultViewForTesting(LoginStatus status);
38 38
39 private: 39 private:
40 // SystemTrayItem: 40 // SystemTrayItem:
41 views::View* CreateTrayView(LoginStatus status) override; 41 views::View* CreateTrayView(LoginStatus status) override;
42 views::View* CreateDefaultView(LoginStatus status) override; 42 views::View* CreateDefaultView(LoginStatus status) override;
43 void DestroyTrayView() override; 43 void DestroyTrayView() override;
44 void DestroyDefaultView() override; 44 void DestroyDefaultView() override;
45 void UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) override; 45 void UpdateAfterShelfAlignmentChange() override;
46 46
47 // ClockObserver: 47 // ClockObserver:
48 void OnDateFormatChanged() override; 48 void OnDateFormatChanged() override;
49 void OnSystemClockTimeUpdated() override; 49 void OnSystemClockTimeUpdated() override;
50 void OnSystemClockCanSetTimeChanged(bool can_set_time) override; 50 void OnSystemClockCanSetTimeChanged(bool can_set_time) override;
51 void Refresh() override; 51 void Refresh() override;
52 52
53 void SetupLabelForTimeTray(views::Label* label); 53 void SetupLabelForTimeTray(views::Label* label);
54 void UpdateTimeFormat(); 54 void UpdateTimeFormat();
55 55
56 tray::TimeView* tray_view_; 56 tray::TimeView* tray_view_;
57 SystemInfoDefaultView* default_view_; 57 SystemInfoDefaultView* default_view_;
58 LoginStatus login_status_; 58 LoginStatus login_status_;
59 59
60 std::unique_ptr<SystemClockObserver> system_clock_observer_; 60 std::unique_ptr<SystemClockObserver> system_clock_observer_;
61 61
62 DISALLOW_COPY_AND_ASSIGN(TraySystemInfo); 62 DISALLOW_COPY_AND_ASSIGN(TraySystemInfo);
63 }; 63 };
64 64
65 } // namespace ash 65 } // namespace ash
66 66
67 #endif // ASH_SYSTEM_DATE_TRAY_SYSTEM_INFO_H_ 67 #endif // ASH_SYSTEM_DATE_TRAY_SYSTEM_INFO_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_widget.cc ('k') | ash/system/date/tray_system_info.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698