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/chromeos/label_tray_view.h" | 5 #include "ash/system/chromeos/label_tray_view.h" |
6 | 6 |
7 #include "ash/system/tray/hover_highlight_view.h" | 7 #include "ash/system/tray/hover_highlight_view.h" |
8 #include "ash/system/tray/tray_constants.h" | 8 #include "ash/system/tray/tray_constants.h" |
9 #include "ash/system/tray/view_click_listener.h" | 9 #include "ash/system/tray/view_click_listener.h" |
10 #include "ui/base/resource/resource_bundle.h" | 10 #include "ui/base/resource/resource_bundle.h" |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
46 HoverHighlightView* child = new HoverHighlightView(click_listener_); | 46 HoverHighlightView* child = new HoverHighlightView(click_listener_); |
47 if (icon_resource_id_) { | 47 if (icon_resource_id_) { |
48 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); | 48 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); |
49 const gfx::ImageSkia* icon = rb.GetImageSkiaNamed(icon_resource_id_); | 49 const gfx::ImageSkia* icon = rb.GetImageSkiaNamed(icon_resource_id_); |
50 child->AddIconAndLabel(*icon, message, gfx::Font::NORMAL); | 50 child->AddIconAndLabel(*icon, message, gfx::Font::NORMAL); |
51 child->SetBorder(views::Border::CreateEmptyBorder( | 51 child->SetBorder(views::Border::CreateEmptyBorder( |
52 0, kTrayPopupPaddingHorizontal, 0, kTrayPopupPaddingHorizontal)); | 52 0, kTrayPopupPaddingHorizontal, 0, kTrayPopupPaddingHorizontal)); |
53 child->text_label()->SetMultiLine(true); | 53 child->text_label()->SetMultiLine(true); |
54 child->text_label()->SizeToFit(kTrayNotificationContentsWidth); | 54 child->text_label()->SizeToFit(kTrayNotificationContentsWidth); |
55 } else { | 55 } else { |
56 child->AddLabel(message, gfx::Font::NORMAL); | 56 child->AddLabel(message, gfx::ALIGN_LEFT, gfx::Font::NORMAL); |
57 child->text_label()->SetMultiLine(true); | 57 child->text_label()->SetMultiLine(true); |
58 child->text_label()->SizeToFit(kTrayNotificationContentsWidth + | 58 child->text_label()->SizeToFit(kTrayNotificationContentsWidth + |
59 kNotificationIconWidth); | 59 kNotificationIconWidth); |
60 } | 60 } |
61 child->text_label()->SetAllowCharacterBreak(true); | 61 child->text_label()->SetAllowCharacterBreak(true); |
62 child->SetExpandable(true); | 62 child->SetExpandable(true); |
63 child->SetVisible(true); | 63 child->SetVisible(true); |
64 return child; | 64 return child; |
65 } | 65 } |
66 | 66 |
67 } // namespace internal | 67 } // namespace internal |
68 } // namespace ash | 68 } // namespace ash |
OLD | NEW |