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/tray/tray_utils.h" | 5 #include "ash/system/tray/tray_utils.h" |
6 | 6 |
7 #include "ash/shelf/shelf_util.h" | 7 #include "ash/shelf/shelf_util.h" |
8 #include "ash/system/tray/tray_constants.h" | 8 #include "ash/system/tray/tray_constants.h" |
9 #include "ash/system/tray/tray_item_view.h" | 9 #include "ash/system/tray/tray_item_view.h" |
10 #include "ash/wm/common/shelf/wm_shelf_util.h" | 10 #include "ash/wm/common/shelf/wm_shelf_util.h" |
11 #include "ui/accessibility/ax_view_state.h" | 11 #include "ui/accessibility/ax_view_state.h" |
12 #include "ui/gfx/font_list.h" | 12 #include "ui/gfx/font_list.h" |
13 #include "ui/gfx/geometry/vector2d.h" | 13 #include "ui/gfx/geometry/vector2d.h" |
14 #include "ui/views/border.h" | 14 #include "ui/views/border.h" |
15 #include "ui/views/controls/label.h" | 15 #include "ui/views/controls/label.h" |
16 | 16 |
17 namespace ash { | 17 namespace ash { |
18 | 18 |
19 void SetupLabelForTray(views::Label* label) { | 19 void SetupLabelForTray(views::Label* label) { |
20 label->SetFontList(gfx::FontList().Derive(1, gfx::Font::BOLD)); | 20 label->SetFontList( |
| 21 gfx::FontList().Derive(1, gfx::Font::NORMAL, gfx::Font::Weight::BOLD)); |
21 label->SetAutoColorReadabilityEnabled(false); | 22 label->SetAutoColorReadabilityEnabled(false); |
22 label->SetEnabledColor(SK_ColorWHITE); | 23 label->SetEnabledColor(SK_ColorWHITE); |
23 label->SetBackgroundColor(SkColorSetARGB(0, 255, 255, 255)); | 24 label->SetBackgroundColor(SkColorSetARGB(0, 255, 255, 255)); |
24 label->SetShadows(gfx::ShadowValues( | 25 label->SetShadows(gfx::ShadowValues( |
25 1, | 26 1, |
26 gfx::ShadowValue(gfx::Vector2d(0, 1), 0, SkColorSetARGB(64, 0, 0, 0)))); | 27 gfx::ShadowValue(gfx::Vector2d(0, 1), 0, SkColorSetARGB(64, 0, 0, 0)))); |
27 } | 28 } |
28 | 29 |
29 void SetTrayImageItemBorder(views::View* tray_view, | 30 void SetTrayImageItemBorder(views::View* tray_view, |
30 wm::ShelfAlignment alignment) { | 31 wm::ShelfAlignment alignment) { |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
69 // Do not descend into static text labels which may compute their own labels | 70 // Do not descend into static text labels which may compute their own labels |
70 // recursively. | 71 // recursively. |
71 if (temp_state.role == ui::AX_ROLE_STATIC_TEXT) | 72 if (temp_state.role == ui::AX_ROLE_STATIC_TEXT) |
72 return; | 73 return; |
73 | 74 |
74 for (int i = 0; i < view->child_count(); ++i) | 75 for (int i = 0; i < view->child_count(); ++i) |
75 GetAccessibleLabelFromDescendantViews(view->child_at(i), out_labels); | 76 GetAccessibleLabelFromDescendantViews(view->child_at(i), out_labels); |
76 } | 77 } |
77 | 78 |
78 } // namespace ash | 79 } // namespace ash |
OLD | NEW |