| Index: ash/common/system/tray/tray_item_more.cc
|
| diff --git a/ash/common/system/tray/tray_item_more.cc b/ash/common/system/tray/tray_item_more.cc
|
| index 6d4fe55191bcf428fd06a196cbcf24986915adac..62f37cdd4a3b67b761e43a302d09d98c9e26dd84 100644
|
| --- a/ash/common/system/tray/tray_item_more.cc
|
| +++ b/ash/common/system/tray/tray_item_more.cc
|
| @@ -23,9 +23,9 @@ namespace ash {
|
| TrayItemMore::TrayItemMore(SystemTrayItem* owner, bool show_more)
|
| : owner_(owner),
|
| show_more_(show_more),
|
| - icon_(NULL),
|
| - label_(NULL),
|
| - more_(NULL) {
|
| + icon_(nullptr),
|
| + label_(nullptr),
|
| + more_(nullptr) {
|
| SetLayoutManager(new views::BoxLayout(views::BoxLayout::kHorizontal,
|
| kTrayPopupPaddingHorizontal, 0,
|
| kTrayPopupPaddingBetweenItems));
|
| @@ -69,12 +69,6 @@ void TrayItemMore::SetAccessibleName(const base::string16& name) {
|
| accessible_name_ = name;
|
| }
|
|
|
| -void TrayItemMore::ReplaceIcon(views::View* view) {
|
| - delete icon_;
|
| - icon_ = NULL;
|
| - AddChildViewAt(view, 0);
|
| -}
|
| -
|
| bool TrayItemMore::PerformAction(const ui::Event& event) {
|
| if (!show_more_)
|
| return false;
|
|
|