OLD | NEW |
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 #include "ash/system/date/date_view.h" | 5 #include "ash/system/date/date_view.h" |
6 | 6 |
7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
8 #include "ash/system/tray/system_tray_delegate.h" | 8 #include "ash/system/tray/system_tray_delegate.h" |
9 #include "ash/system/tray/tray_constants.h" | 9 #include "ash/system/tray/tray_constants.h" |
10 #include "base/i18n/time_formatting.h" | 10 #include "base/i18n/time_formatting.h" |
11 #include "base/time.h" | 11 #include "base/time.h" |
12 #include "base/utf_string_conversions.h" | 12 #include "base/utf_string_conversions.h" |
13 #include "grit/ash_strings.h" | 13 #include "grit/ash_strings.h" |
| 14 #include "third_party/icu/public/i18n/unicode/datefmt.h" |
| 15 #include "third_party/icu/public/i18n/unicode/dtptngen.h" |
| 16 #include "third_party/icu/public/i18n/unicode/smpdtfmt.h" |
14 #include "ui/base/l10n/l10n_util.h" | 17 #include "ui/base/l10n/l10n_util.h" |
15 #include "ui/views/controls/label.h" | 18 #include "ui/views/controls/label.h" |
16 #include "ui/views/layout/box_layout.h" | 19 #include "ui/views/layout/box_layout.h" |
17 #include "ui/views/layout/grid_layout.h" | 20 #include "ui/views/layout/grid_layout.h" |
18 #include "ui/views/widget/widget.h" | 21 #include "ui/views/widget/widget.h" |
19 #include "unicode/datefmt.h" | |
20 #include "unicode/dtptngen.h" | |
21 #include "unicode/smpdtfmt.h" | |
22 | 22 |
23 namespace ash { | 23 namespace ash { |
24 namespace internal { | 24 namespace internal { |
25 namespace tray { | 25 namespace tray { |
26 | 26 |
27 namespace { | 27 namespace { |
28 | 28 |
29 // Amount of slop to add into the timer to make sure we're into the next minute | 29 // Amount of slop to add into the timer to make sure we're into the next minute |
30 // when the timer goes off. | 30 // when the timer goes off. |
31 const int kTimerSlopSeconds = 1; | 31 const int kTimerSlopSeconds = 1; |
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
276 void TimeView::SetupLabel(views::Label* label) { | 276 void TimeView::SetupLabel(views::Label* label) { |
277 label->set_owned_by_client(); | 277 label->set_owned_by_client(); |
278 SetupLabelForTray(label); | 278 SetupLabelForTray(label); |
279 gfx::Font font = label->font(); | 279 gfx::Font font = label->font(); |
280 label->SetFont(font.DeriveFont(0, font.GetStyle() & ~gfx::Font::BOLD)); | 280 label->SetFont(font.DeriveFont(0, font.GetStyle() & ~gfx::Font::BOLD)); |
281 } | 281 } |
282 | 282 |
283 } // namespace tray | 283 } // namespace tray |
284 } // namespace internal | 284 } // namespace internal |
285 } // namespace ash | 285 } // namespace ash |
OLD | NEW |