Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(47)

Unified Diff: ash/common/system/tray/tray_item_more.cc

Issue 2233963002: Removed unused TrayItemMore::ReplaceIcon(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge branch 'master' into remove_TrayItemMore_ReplaceIcon Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/common/system/tray/tray_item_more.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « ash/common/system/tray/tray_item_more.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698