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 "ash/system/tray/tray_utils.h" | 10 #include "ash/system/tray/tray_utils.h" |
11 #include "base/i18n/time_formatting.h" | 11 #include "base/i18n/time_formatting.h" |
| 12 #include "base/strings/utf_string_conversions.h" |
12 #include "base/time.h" | 13 #include "base/time.h" |
13 #include "base/utf_string_conversions.h" | |
14 #include "grit/ash_strings.h" | 14 #include "grit/ash_strings.h" |
15 #include "third_party/icu/public/i18n/unicode/datefmt.h" | 15 #include "third_party/icu/public/i18n/unicode/datefmt.h" |
16 #include "third_party/icu/public/i18n/unicode/dtptngen.h" | 16 #include "third_party/icu/public/i18n/unicode/dtptngen.h" |
17 #include "third_party/icu/public/i18n/unicode/smpdtfmt.h" | 17 #include "third_party/icu/public/i18n/unicode/smpdtfmt.h" |
18 #include "ui/base/l10n/l10n_util.h" | 18 #include "ui/base/l10n/l10n_util.h" |
19 #include "ui/views/controls/label.h" | 19 #include "ui/views/controls/label.h" |
20 #include "ui/views/layout/box_layout.h" | 20 #include "ui/views/layout/box_layout.h" |
21 #include "ui/views/layout/grid_layout.h" | 21 #include "ui/views/layout/grid_layout.h" |
22 #include "ui/views/widget/widget.h" | 22 #include "ui/views/widget/widget.h" |
23 | 23 |
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
282 void TimeView::SetupLabel(views::Label* label) { | 282 void TimeView::SetupLabel(views::Label* label) { |
283 label->set_owned_by_client(); | 283 label->set_owned_by_client(); |
284 SetupLabelForTray(label); | 284 SetupLabelForTray(label); |
285 gfx::Font font = label->font(); | 285 gfx::Font font = label->font(); |
286 label->SetFont(font.DeriveFont(0, font.GetStyle() & ~gfx::Font::BOLD)); | 286 label->SetFont(font.DeriveFont(0, font.GetStyle() & ~gfx::Font::BOLD)); |
287 } | 287 } |
288 | 288 |
289 } // namespace tray | 289 } // namespace tray |
290 } // namespace internal | 290 } // namespace internal |
291 } // namespace ash | 291 } // namespace ash |
OLD | NEW |