Remove close_on_deactivate=false for tray bubbles (2nd)

ash/system/tray/tray_bubble_wrapper.cc

 // 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.
 
 #include "ash/system/tray/tray_bubble_wrapper.h"
 
 #include "ash/system/tray/tray_background_view.h"
 #include "ash/system/tray/tray_event_filter.h"
 #include "ash/wm/window_properties.h"
+#include "base/bind.h"
+#include "base/message_loop.h"
+#include "base/time.h"
 #include "ui/views/bubble/tray_bubble_view.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace internal {
 
 TrayBubbleWrapper::TrayBubbleWrapper(TrayBackgroundView* tray,
                                      views::TrayBubbleView* bubble_view)
     : tray_(tray),
       bubble_view_(bubble_view) {
+  DCHECK(tray_);
   bubble_widget_ = views::BubbleDelegateView::CreateBubble(bubble_view_);
   bubble_widget_->AddObserver(this);
   bubble_widget_->GetNativeView()->
       SetProperty(internal::kStayInSameRootWindowKey, true);
 
   tray_->InitializeBubbleAnimations(bubble_widget_);
   tray_->UpdateBubbleViewArrow(bubble_view_);
   bubble_view_->InitializeAndShowBubble();
 
   tray->tray_event_filter()->AddWrapper(this);
 }
 
 TrayBubbleWrapper::~TrayBubbleWrapper() {
   tray_->tray_event_filter()->RemoveWrapper(this);
   if (bubble_widget_) {
     bubble_widget_->RemoveObserver(this);
     bubble_widget_->Close();
   }
 }
 
 void TrayBubbleWrapper::OnWidgetDestroying(views::Widget* widget) {
   CHECK_EQ(bubble_widget_, widget);
   bubble_widget_ = NULL;
-  tray_->HideBubbleWithView(bubble_view_);  // May destroy |bubble_view_|
+
+  // Do not call HideBubbleWithView directly but post the task to ensure that
+  // HideBubbleWithView is called after the click event on the tray button is
+  // handled. See crbug.com/177075 and crbug.com/169940
+  MessageLoopForUI::current()->PostTask(
+      FROM_HERE,
+      base::Bind(&TrayBackgroundView::HideBubbleWithView,
+                 base::Unretained(tray_), base::Unretained(bubble_view_)));

[stevenjb, 2013/03/06 02:35:26]

Is there any possibility that tray_ or bubble_view_ could get destroyed before
HideBubbleWithView gets called? We may need to add a method in this class
instead that calls HideBubbleWithView(tray_, bubble_view), and add a
WeakPtrFactory to this class?

[Jun Mukai, 2013/03/06 04:36:57]

Good catch. It's really unlikely but it may happen. I think it's still safe to
use bubble_view_ because it's an argument (and it is just only used for
comparison).  I took notes of this as the comment of tray_background_view.h

tray_ owns this and outlives, but probably it could also happen. Thus I put
WeakPtr to this class and added HideBubbleWithView method too.

 }
 
 }  // namespace internal
 }  // namespace ash