Fix browser crash due to bookmark bubble view loosing activation while gettin...

chrome/browser/ui/views/bookmark_bubble_view.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 "chrome/browser/views/bookmark_bubble_view.h"
 
 #include "app/keyboard_codes.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/string16.h"
 #include "base/string_util.h"
@@ skipping 73 matching lines @@
                               Profile* profile,
                               const GURL& url,
                               bool newly_bookmarked) {
   if (IsShowing())
     return;
 
   bubble_ = new BookmarkBubbleView(delegate, profile, url, newly_bookmarked);
   InfoBubble* info_bubble = InfoBubble::Show(
       parent->GetClientView()->GetWidget(), bounds, BubbleBorder::TOP_RIGHT,
       bubble_, bubble_);
+  // |bubble_| can be set to NULL in InfoBubbleClosing when we close the bubble
+  // asynchronously. However, that can happen during the Show call above if the
+  // window loses activation while we are getting to ready to show the bubble,
+  // so we must check to make sure we still have a valid bubble before
+  // proceeding.
+  if (!bubble_)
+    return;
   bubble_->set_info_bubble(info_bubble);
   info_bubble->SizeToContents();
   GURL url_ptr(url);
   NotificationService::current()->Notify(
       NotificationType::BOOKMARK_BUBBLE_SHOWN,
       Source<Profile>(profile->GetOriginalProfile()),
       Details<GURL>(&url_ptr));
   bubble_->BubbleShown();
 }
 
@@ skipping 303 matching lines @@
       const BookmarkNode* new_parent =
           parent_model_.GetNodeAt(parent_combobox_->selected_item());
       if (new_parent != node->GetParent()) {
         UserMetrics::RecordAction(
             UserMetricsAction("BookmarkBubble_ChangeParent"), profile_);
         model->Move(node, new_parent, new_parent->GetChildCount());
       }
     }
   }
 }