Re-factor system tray code controlling launcher visibility

ash/system/tray/system_tray.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_
 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_
 
 #include "ash/ash_export.h"
 #include "ash/system/power/power_supply_status.h"
 #include "ash/system/tray/tray_background_view.h"
@@ skipping 77 matching lines @@
 
   // Updates the items when the login status of the system changes.
   void UpdateAfterLoginStatusChange(user::LoginStatus login_status);
 
   // Updates the items when the shelf alignment changes.
   void UpdateAfterShelfAlignmentChange(ShelfAlignment alignment);
 
   // 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_;
   }
   AudioObserver* audio_observer() const {
     return audio_observer_;
   }
   BluetoothObserver* bluetooth_observer() const {
     return bluetooth_observer_;
   }
@@ skipping 70 matching lines @@
                  int x_offset);
 
   // Constructs or re-constructs |notification_bubble_| and populates it with
   // |notification_items_|, or destroys it if there are no notification items.
   void UpdateNotificationBubble();
 
   // Overridden from internal::ActionableView.
   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.
   ScopedVector<SystemTrayItem> items_;
 
   // Pointers to members of |items_|.
   SystemTrayItem* detailed_item_;
   std::vector<SystemTrayItem*> notification_items_;
 
   // Mappings of system tray item and it's view in the tray.
@@ skipping 14 matching lines @@
   SmsObserver* sms_observer_;
   UpdateObserver* update_observer_;
   UserObserver* user_observer_;
 
   // Bubble for default and detailed views.
   scoped_ptr<internal::SystemTrayBubble> bubble_;
 
   // 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_;
 
   // Set to true when system notifications should be hidden (e.g. web
   // notification bubble is visible).
   bool hide_notifications_;
 
   DISALLOW_COPY_AND_ASSIGN(SystemTray);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_