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

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

Issue 10823350: Re-factor system tray code controlling launcher visibility (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 4 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/status_area_widget.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 494ebd0ace0a66c7da6876190a25b7109a38f619..db34c5d3b98a2823f4a2b08a42a991d26f07ffe8 100644
--- a/ash/system/tray/system_tray.h
+++ b/ash/system/tray/system_tray.h
@@ -95,13 +95,14 @@ class ASH_EXPORT SystemTray : public internal::TrayBackgroundView {
// Temporarily hides/unhides the notification bubble.
void SetHideNotifications(bool hidden);
+ // Returns true if the system bubble is visible.
+ bool IsSystemBubbleVisible() const;
+
// Returns true if any bubble is visible.
bool IsAnyBubbleVisible() const;
- // Returns true if the launcher should show.
- bool should_show_launcher() const {
- return bubble_.get() && should_show_launcher_;
- }
+ // Returns true if the mouse is inside the notification bubble.
+ bool IsMouseInNotificationBubble() const;
AccessibilityObserver* accessibility_observer() const {
return accessibility_observer_;
@@ -192,8 +193,6 @@ class ASH_EXPORT SystemTray : public internal::TrayBackgroundView {
virtual bool PerformAction(const ui::Event& event) OVERRIDE;
// Overridden from views::View.
- virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE;
- virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE;
virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
// Owned items.
@@ -228,9 +227,6 @@ class ASH_EXPORT SystemTray : public internal::TrayBackgroundView {
// Bubble for notifications.
scoped_ptr<internal::SystemTrayBubble> notification_bubble_;
- // See description agove getter.
- bool should_show_launcher_;
-
// 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_;
« no previous file with comments | « ash/system/status_area_widget.cc ('k') | ash/system/tray/system_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698