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

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

Issue 2063813002: mash: Move SystemTrayImage and TrayImageItem to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@wmnotifier
Patch Set: rebase 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
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/system/tray/system_tray_item.h"
11 #include "ash/system/date/clock_observer.h" 12 #include "ash/system/date/clock_observer.h"
12 #include "ash/system/tray/system_tray_item.h"
13 #include "base/macros.h" 13 #include "base/macros.h"
14 14
15 namespace views { 15 namespace views {
16 class Label; 16 class Label;
17 } 17 }
18 18
19 namespace ash { 19 namespace ash {
20 class DateDefaultView; 20 class DateDefaultView;
21 #if defined(OS_CHROMEOS) 21 #if defined(OS_CHROMEOS)
22 class SystemClockObserver; 22 class SystemClockObserver;
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 #if defined(OS_CHROMEOS) 75 #if defined(OS_CHROMEOS)
76 std::unique_ptr<SystemClockObserver> system_clock_observer_; 76 std::unique_ptr<SystemClockObserver> system_clock_observer_;
77 #endif 77 #endif
78 78
79 DISALLOW_COPY_AND_ASSIGN(TrayDate); 79 DISALLOW_COPY_AND_ASSIGN(TrayDate);
80 }; 80 };
81 81
82 } // namespace ash 82 } // namespace ash
83 83
84 #endif // ASH_SYSTEM_DATE_TRAY_DATE_H_ 84 #endif // ASH_SYSTEM_DATE_TRAY_DATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698