| 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/common/system/tray/label_tray_view.h" | 5 #include "ash/common/system/tray/label_tray_view.h" |
| 6 | 6 |
| 7 #include "ash/common/system/tray/hover_highlight_view.h" | 7 #include "ash/common/system/tray/hover_highlight_view.h" |
| 8 #include "ash/common/system/tray/tray_constants.h" | 8 #include "ash/common/system/tray/tray_constants.h" |
| 9 #include "ash/common/system/tray/view_click_listener.h" | 9 #include "ash/common/system/tray/view_click_listener.h" |
| 10 #include "ash/resources/grit/ash_resources.h" | 10 #include "ash/resources/grit/ash_resources.h" |
| (...skipping 26 matching lines...) Expand all Loading... |
| 37 SetVisible(true); | 37 SetVisible(true); |
| 38 } else { | 38 } else { |
| 39 SetVisible(false); | 39 SetVisible(false); |
| 40 } | 40 } |
| 41 } | 41 } |
| 42 | 42 |
| 43 views::View* LabelTrayView::CreateChildView( | 43 views::View* LabelTrayView::CreateChildView( |
| 44 const base::string16& message) const { | 44 const base::string16& message) const { |
| 45 HoverHighlightView* child = new HoverHighlightView(click_listener_); | 45 HoverHighlightView* child = new HoverHighlightView(click_listener_); |
| 46 gfx::ImageSkia icon_image = gfx::CreateVectorIcon(icon_, kMenuIconColor); | 46 gfx::ImageSkia icon_image = gfx::CreateVectorIcon(icon_, kMenuIconColor); |
| 47 child->AddIconAndLabelForDefaultView(icon_image, message, | 47 child->AddIconAndLabelForDefaultView(icon_image, message); |
| 48 false /* highlight */); | |
| 49 child->text_label()->SetMultiLine(true); | 48 child->text_label()->SetMultiLine(true); |
| 50 child->text_label()->SetAllowCharacterBreak(true); | 49 child->text_label()->SetAllowCharacterBreak(true); |
| 51 child->SetExpandable(true); | 50 child->SetExpandable(true); |
| 52 child->SetVisible(true); | 51 child->SetVisible(true); |
| 53 return child; | 52 return child; |
| 54 } | 53 } |
| 55 | 54 |
| 56 } // namespace ash | 55 } // namespace ash |
| OLD | NEW |