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

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

Issue 10407080: Add NetworkNotificationView to tray_network. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix NOTREACHED 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 51258d38629240fc5604414b8a5681149e7c0a06..873b40336137ffcb67e6f58c69844d36b98de696 100644
--- a/ash/system/tray/system_tray.h
+++ b/ash/system/tray/system_tray.h
@@ -160,6 +160,9 @@ class ASH_EXPORT SystemTray : public internal::ActionableView,
friend class internal::SystemTrayLayerAnimationObserver;
friend class internal::SystemTrayBubble;
+ // Resets |bubble_| and clears any related state.
+ void DestroyBubble();
+
// Called when the widget associated with |bubble| closes. |bubble| should
// always == |bubble_|. This triggers destroying |bubble_| and hiding the
// launcher if necessary.
@@ -253,6 +256,10 @@ class ASH_EXPORT SystemTray : public internal::ActionableView,
scoped_ptr<internal::SystemTrayLayerAnimationObserver>
layer_animation_observer_;
+ // Keep track of the default view height so that when we create detailed
+ // views directly (e.g. from a notification) we know what height to use.
+ int default_bubble_height_;
+
DISALLOW_COPY_AND_ASSIGN(SystemTray);
};
« 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