| Index: ash/common/system/tray/tray_popup_item_container.cc
|
| diff --git a/ash/common/system/tray/tray_popup_item_container.cc b/ash/common/system/tray/tray_popup_item_container.cc
|
| index 3659ea6e6775c050a96376827854b982f82300bc..103788f7fe4c83a68cafafd0de640ca3df2fb8dc 100644
|
| --- a/ash/common/system/tray/tray_popup_item_container.cc
|
| +++ b/ash/common/system/tray/tray_popup_item_container.cc
|
| @@ -13,14 +13,9 @@
|
| namespace ash {
|
|
|
| TrayPopupItemContainer::TrayPopupItemContainer(views::View* view,
|
| - bool change_background,
|
| - bool draw_border)
|
| + bool change_background)
|
| : active_(false), change_background_(change_background) {
|
| set_notify_enter_exit_on_child(true);
|
| - if (draw_border) {
|
| - SetBorder(
|
| - views::Border::CreateSolidSidedBorder(0, 0, 1, 0, kBorderLightColor));
|
| - }
|
| views::BoxLayout* layout =
|
| new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0);
|
| layout->SetDefaultFlex(1);
|
| @@ -35,6 +30,12 @@ TrayPopupItemContainer::TrayPopupItemContainer(views::View* view,
|
|
|
| TrayPopupItemContainer::~TrayPopupItemContainer() {}
|
|
|
| +void TrayPopupItemContainer::SetDrawBorder(bool draw_border) {
|
| + SetBorder(draw_border ? views::Border::CreateSolidSidedBorder(
|
| + 0, 0, 1, 0, kBorderLightColor)
|
| + : nullptr);
|
| +}
|
| +
|
| void TrayPopupItemContainer::SetActive(bool active) {
|
| if (!change_background_ || active_ == active)
|
| return;
|
|
|