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

Unified Diff: ash/system/tray/system_tray.cc

Issue 9704029: Reland r126700: ash uber tray: Add the detailed network popup (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 9 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/system/tray/system_tray.h ('k') | ash/system/tray/system_tray_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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) {
« no previous file with comments | « ash/system/tray/system_tray.h ('k') | ash/system/tray/system_tray_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698