Index: ash/system/tray/system_tray.cc |
diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc |
index 32d4a4ec81c500241c475d6f20a8581c4cf6417b..3629a206cfe1f48aa1805b8c277ef675910465a0 100644 |
--- a/ash/system/tray/system_tray.cc |
+++ b/ash/system/tray/system_tray.cc |
@@ -280,6 +280,12 @@ class SystemTrayBubble : public views::BubbleDelegateView { |
} // namespace internal |
+NetworkIconInfo::NetworkIconInfo() { |
+} |
+ |
+NetworkIconInfo::~NetworkIconInfo() { |
+} |
+ |
SystemTray::SystemTray() |
: items_(), |
bubble_(NULL), |
@@ -321,6 +327,17 @@ void SystemTray::RemoveTrayItem(SystemTrayItem* item) { |
NOTIMPLEMENTED(); |
} |
+void SystemTray::ShowDefaultView() { |
+ if (popup_) { |
+ popup_->RemoveObserver(this); |
+ popup_->Close(); |
+ } |
+ popup_ = NULL; |
+ bubble_ = NULL; |
+ |
+ ShowItems(items_, false, true); |
+} |
+ |
void SystemTray::ShowDetailedView(SystemTrayItem* item, |
int close_delay, |
bool activate) { |