Revert 137059 - Better fix for closing uber tray when clicking on Desktop

ash/system/tray/system_tray_bubble.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_BUBBLE_H_
 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_BUBBLE_H_
 #pragma once
 
 #include "ash/system/user/login_status.h"
 #include "base/base_export.h"
+#include "base/message_pump_observer.h"
 #include "base/timer.h"
 #include "ui/views/bubble/bubble_delegate.h"
 #include "ui/views/widget/widget.h"
 
 #include <vector>
 
 namespace ash {
 
 class SystemTray;
 class SystemTrayItem;
@@ skipping 29 matching lines @@
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual void OnMouseEntered(const views::MouseEvent& event) OVERRIDE;
   virtual void OnMouseExited(const views::MouseEvent& event) OVERRIDE;
 
   SystemTrayBubble* host_;
   bool can_activate_;
 
   DISALLOW_COPY_AND_ASSIGN(SystemTrayBubbleView);
 };
 
-class SystemTrayBubble : public views::Widget::Observer {
+class SystemTrayBubble : public base::MessagePumpObserver,
+                         public views::Widget::Observer {
  public:
   enum BubbleType {
     BUBBLE_TYPE_DEFAULT,
     BUBBLE_TYPE_DETAILED,
     BUBBLE_TYPE_NOTIFICATION
   };
 
   enum AnchorType {
     ANCHOR_TYPE_TRAY,
     ANCHOR_TYPE_BUBBLE
@@ skipping 29 matching lines @@
 
   void DestroyItemViews();
   void StartAutoCloseTimer(int seconds);
   void StopAutoCloseTimer();
   void RestartAutoCloseTimer();
   void Close();
 
  private:
   void CreateItemViews(user::LoginStatus login_status);
 
+  // Overridden from base::MessagePumpObserver.
+  virtual base::EventStatus WillProcessEvent(
+      const base::NativeEvent& event) OVERRIDE;
+  virtual void DidProcessEvent(const base::NativeEvent& event) OVERRIDE;
   // Overridden from views::Widget::Observer.
   virtual void OnWidgetClosing(views::Widget* widget) OVERRIDE;
+  virtual void OnWidgetVisibilityChanged(views::Widget* widget,
+                                         bool visible) OVERRIDE;
 
   ash::SystemTray* tray_;
   SystemTrayBubbleView* bubble_view_;
   views::Widget* bubble_widget_;
   std::vector<ash::SystemTrayItem*> items_;
   BubbleType bubble_type_;
   AnchorType anchor_type_;
 
   int autoclose_delay_;
   base::OneShotTimer<SystemTrayBubble> autoclose_;
 
   DISALLOW_COPY_AND_ASSIGN(SystemTrayBubble);
 };
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_TRAY_SYSTEM_TRAY_BUBBLE_H_