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

Side by Side Diff: ash/system/date/date_view.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: 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_DATE_VIEW_H_ 5 #ifndef ASH_SYSTEM_DATE_DATE_VIEW_H_
6 #define ASH_SYSTEM_DATE_DATE_VIEW_H_ 6 #define ASH_SYSTEM_DATE_DATE_VIEW_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/actionable_view.h" 11 #include "ash/common/system/tray/actionable_view.h"
12 #include "ash/system/date/tray_date.h" 12 #include "ash/system/date/tray_date.h"
13 #include "base/i18n/time_formatting.h" 13 #include "base/i18n/time_formatting.h"
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "base/timer/timer.h" 15 #include "base/time/time.h"
msw 2016/06/14 00:18:26 Isn't base/timer/timer.h needed for |base::OneShot
James Cook 2016/06/14 16:54:07 Whoops. I put it back and forward-declared base::T
16 #include "ui/views/view.h" 16 #include "ui/views/view.h"
17 17
18 namespace views { 18 namespace views {
19 class Label; 19 class Label;
20 } 20 }
21 21
22 namespace ash { 22 namespace ash {
23 namespace tray { 23 namespace tray {
24 24
25 // Abstract base class containing common updating and layout code for the 25 // Abstract base class containing common updating and layout code for the
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 std::unique_ptr<views::Label> vertical_label_hours_; 133 std::unique_ptr<views::Label> vertical_label_hours_;
134 std::unique_ptr<views::Label> vertical_label_minutes_; 134 std::unique_ptr<views::Label> vertical_label_minutes_;
135 135
136 DISALLOW_COPY_AND_ASSIGN(TimeView); 136 DISALLOW_COPY_AND_ASSIGN(TimeView);
137 }; 137 };
138 138
139 } // namespace tray 139 } // namespace tray
140 } // namespace ash 140 } // namespace ash
141 141
142 #endif // ASH_SYSTEM_DATE_DATE_VIEW_H_ 142 #endif // ASH_SYSTEM_DATE_DATE_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698