| Index: ash/common/system/tray/special_popup_row.cc
|
| diff --git a/ash/common/system/tray/special_popup_row.cc b/ash/common/system/tray/special_popup_row.cc
|
| index 45691c95681e8d5f666ccad3db5a61682649a1f4..51fce4db26ceb8464a64d1d0bfc7d030f367c2c4 100644
|
| --- a/ash/common/system/tray/special_popup_row.cc
|
| +++ b/ash/common/system/tray/special_popup_row.cc
|
| @@ -39,25 +39,22 @@ views::View* CreatePopupHeaderButtonsContainer() {
|
|
|
| } // namespace
|
|
|
| -SpecialPopupRow::SpecialPopupRow()
|
| - : content_(NULL),
|
| - button_container_(NULL) {
|
| - set_background(views::Background::CreateSolidBackground(
|
| - kHeaderBackgroundColor));
|
| - SetBorder(views::Border::CreateSolidSidedBorder(
|
| - kBorderHeight, 0, 0, 0, kBorderColor));
|
| +SpecialPopupRow::SpecialPopupRow() : content_(NULL), button_container_(NULL) {
|
| + set_background(
|
| + views::Background::CreateSolidBackground(kHeaderBackgroundColor));
|
| + SetBorder(views::Border::CreateSolidSidedBorder(kBorderHeight, 0, 0, 0,
|
| + kBorderColor));
|
| SetLayoutManager(
|
| new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0));
|
| }
|
|
|
| -SpecialPopupRow::~SpecialPopupRow() {
|
| -}
|
| +SpecialPopupRow::~SpecialPopupRow() {}
|
|
|
| void SpecialPopupRow::SetTextLabel(int string_id, ViewClickListener* listener) {
|
| ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
|
| HoverHighlightView* container = new HoverHighlightView(listener);
|
| - container->SetLayoutManager(new
|
| - views::BoxLayout(views::BoxLayout::kHorizontal, 0, 3, kIconPaddingLeft));
|
| + container->SetLayoutManager(new views::BoxLayout(
|
| + views::BoxLayout::kHorizontal, 0, 3, kIconPaddingLeft));
|
|
|
| container->set_highlight_color(SkColorSetARGB(0, 0, 0, 0));
|
| container->set_default_color(SkColorSetARGB(0, 0, 0, 0));
|
|
|