Remove close_on_deactivate=false for tray bubbles (2nd)

ash/system/tray/tray_bubble_wrapper.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_TRAY_BUBBLE_WRAPPER_H_
 #define ASH_SYSTEM_TRAY_TRAY_BUBBLE_WRAPPER_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
 #include "ui/views/widget/widget_observer.h"
 
 namespace views {
 class TrayBubbleView;
 }
 
 namespace ash {
 namespace internal {
 
 class TrayBackgroundView;
 class TrayEventFilter;
 
 // Creates and manages the Widget and EventFilter components of a bubble.
-
-class TrayBubbleWrapper : public views::WidgetObserver {
+class TrayBubbleWrapper : public views::WidgetObserver,
+                          public base::SupportsWeakPtr<TrayBubbleWrapper> {
  public:
   TrayBubbleWrapper(TrayBackgroundView* tray,
                     views::TrayBubbleView* bubble_view);
   virtual ~TrayBubbleWrapper();
 
   // views::WidgetObserver overrides:
   virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE;
 
   const TrayBackgroundView* tray() const { return tray_; }
   TrayBackgroundView* tray() { return tray_; }
   const views::TrayBubbleView* bubble_view() const { return bubble_view_; }
   const views::Widget* bubble_widget() const { return bubble_widget_; }
 
  private:
+  void HideBubbleWithView();
+
+  // unowned. |tray_| owns this and it should outlive.
   TrayBackgroundView* tray_;
-  views::TrayBubbleView* bubble_view_;  // unowned
+
+  // unowned.
+  views::TrayBubbleView* bubble_view_;
+
+  // unowned.
   views::Widget* bubble_widget_;
 
   DISALLOW_COPY_AND_ASSIGN(TrayBubbleWrapper);
 };
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_TRAY_TRAY_BUBBLE_WRAPPER_H_