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

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

Issue 10384178: ash: Make sure all the sub-popups retain the same height as the main popup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 7 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/network/tray_network.cc ('k') | ash/system/tray/system_tray.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray/system_tray.h
diff --git a/ash/system/tray/system_tray.h b/ash/system/tray/system_tray.h
index 376fea4fa1114b45cbde16dec4e91b58e143c26f..8bfbdac351806eae8c7c347b5beeb1a132252777 100644
--- a/ash/system/tray/system_tray.h
+++ b/ash/system/tray/system_tray.h
@@ -41,6 +41,12 @@ class SystemTrayBubble;
class SystemTrayLayerAnimationObserver;
}
+// There are different methods for creating bubble views.
+enum BubbleCreationType {
+ BUBBLE_CREATE_NEW, // Closes any existing bubble and creates a new one.
+ BUBBLE_USE_EXISTING, // Uses any existing bubble, or creates a new one.
+};
+
class ASH_EXPORT SystemTray : public internal::ActionableView,
public internal::BackgroundAnimatorDelegate {
public:
@@ -60,13 +66,14 @@ class ASH_EXPORT SystemTray : public internal::ActionableView,
void RemoveTrayItem(SystemTrayItem* item);
// Shows the default view of all items.
- void ShowDefaultView();
+ void ShowDefaultView(BubbleCreationType creation_type);
// Shows details of a particular item. If |close_delay_in_seconds| is
// non-zero, then the view is automatically closed after the specified time.
void ShowDetailedView(SystemTrayItem* item,
int close_delay_in_seconds,
- bool activate);
+ bool activate,
+ BubbleCreationType creation_type);
// Continue showing the existing detailed view, if any, for |close_delay|
// seconds.
@@ -150,7 +157,8 @@ class ASH_EXPORT SystemTray : public internal::ActionableView,
// Constructs or re-constructs |bubble_| and populates it with |items|.
void ShowItems(const std::vector<SystemTrayItem*>& items,
bool details,
- bool activate);
+ bool activate,
+ BubbleCreationType creation_type);
// Constructs or re-constructs |notification_bubble_| and populates it with
// |notification_items_|, or destroys it if there are no notification items.
« no previous file with comments | « ash/system/network/tray_network.cc ('k') | ash/system/tray/system_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698