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/command_line.h" | 11 #include "base/command_line.h" |
12 #include "base/i18n/rtl.h" | 12 #include "base/i18n/rtl.h" |
13 #include "base/i18n/time_formatting.h" | 13 #include "base/i18n/time_formatting.h" |
14 #include "base/strings/utf_string_conversions.h" | 14 #include "base/strings/utf_string_conversions.h" |
15 #include "base/time/time.h" | 15 #include "base/time/time.h" |
16 #include "grit/ash_strings.h" | 16 #include "grit/ash_strings.h" |
17 #include "third_party/icu/source/i18n/unicode/datefmt.h" | 17 #include "third_party/icu/source/i18n/unicode/datefmt.h" |
18 #include "third_party/icu/source/i18n/unicode/dtptngen.h" | 18 #include "third_party/icu/source/i18n/unicode/dtptngen.h" |
19 #include "third_party/icu/source/i18n/unicode/smpdtfmt.h" | 19 #include "third_party/icu/source/i18n/unicode/smpdtfmt.h" |
| 20 #include "ui/accessibility/ax_enums.h" |
20 #include "ui/accessibility/ax_view_state.h" | 21 #include "ui/accessibility/ax_view_state.h" |
21 #include "ui/base/l10n/l10n_util.h" | 22 #include "ui/base/l10n/l10n_util.h" |
22 #include "ui/base/ui_base_switches_util.h" | 23 #include "ui/base/ui_base_switches_util.h" |
23 #include "ui/views/border.h" | 24 #include "ui/views/border.h" |
24 #include "ui/views/controls/label.h" | 25 #include "ui/views/controls/label.h" |
25 #include "ui/views/layout/box_layout.h" | 26 #include "ui/views/layout/box_layout.h" |
26 #include "ui/views/layout/grid_layout.h" | 27 #include "ui/views/layout/grid_layout.h" |
27 #include "ui/views/widget/widget.h" | 28 #include "ui/views/widget/widget.h" |
28 | 29 |
29 namespace ash { | 30 namespace ash { |
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
343 } | 344 } |
344 | 345 |
345 void TimeView::SetupLabel(views::Label* label) { | 346 void TimeView::SetupLabel(views::Label* label) { |
346 label->set_owned_by_client(); | 347 label->set_owned_by_client(); |
347 SetupLabelForTray(label); | 348 SetupLabelForTray(label); |
348 label->SetElideBehavior(gfx::NO_ELIDE); | 349 label->SetElideBehavior(gfx::NO_ELIDE); |
349 } | 350 } |
350 | 351 |
351 } // namespace tray | 352 } // namespace tray |
352 } // namespace ash | 353 } // namespace ash |
OLD | NEW |