Patch AvatarMenuBubbleView crash; only SizeToContents if GetBubbleFrameView.

chrome/browser/ui/views/avatar_menu_bubble_view.cc

 // 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/ui/views/avatar_menu_bubble_view.h"
 
 #include <algorithm>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 119 matching lines @@
 // A custom image view that ignores mouse events so that the parent can receive
 // them them instead.
 class ProfileImageView : public views::ImageView {
  public:
   virtual bool HitTest(const gfx::Point& l) const OVERRIDE;
 };
 
 bool ProfileImageView::HitTest(const gfx::Point& l) const {
   return false;
 }
 

[Peter Kasting, 2011/12/14 22:41:56]

Nit: Don't remove this.

(Besides, you didn't remove e.g. line 127.)

-
 // ProfileItemView ------------------------------------------------------------
 
 // Control that shows information about a single profile.
 class ProfileItemView : public views::CustomButton,
                         public HighlightDelegate {
  public:
   ProfileItemView(const AvatarMenuModel::Item& item,
                   views::ButtonListener* switch_profile_listener,
                   views::LinkListener* edit_profile_listener);
 
@@ skipping 273 matching lines @@
   // Moved the focus up or down by 1.
   if (accelerator.key_code() == ui::VKEY_DOWN)
     focus_index = (focus_index + 1) % item_views_.size();
   else
     focus_index = ((focus_index > 0) ? focus_index : item_views_.size()) - 1;
   item_views_[focus_index]->RequestFocus();
 
   return true;
 }
 
-void AvatarMenuBubbleView::ViewHierarchyChanged(bool is_add,
-                                                views::View* parent,
-                                                views::View* child) {
-  // Build the menu for the first time.
-  if (!add_profile_link_ && is_add && child == this)
-    OnAvatarMenuModelChanged(avatar_menu_model_.get());
-
-  views::BubbleDelegateView::ViewHierarchyChanged(is_add, parent, child);
-}
-
 void AvatarMenuBubbleView::ButtonPressed(views::Button* sender,
                                          const views::Event& event) {
   for (size_t i = 0; i < item_views_.size(); ++i) {
     ProfileItemView* item_view = static_cast<ProfileItemView*>(item_views_[i]);
     if (sender == item_view) {
       // Clicking on the active profile shouldn't do anything.
       if (!item_view->item().active)
         avatar_menu_model_->SwitchToProfile(i);
       break;
     }
@@ skipping 13 matching lines @@
       return;
     }
   }
 }
 
 gfx::Rect AvatarMenuBubbleView::GetAnchorRect() {
   return anchor_rect_;
 }
 
 void AvatarMenuBubbleView::Init() {
+  // Build the menu for the first time.
+  OnAvatarMenuModelChanged(avatar_menu_model_.get());
   AddAccelerator(ui::Accelerator(ui::VKEY_DOWN, 0));
   AddAccelerator(ui::Accelerator(ui::VKEY_UP, 0));
 }
 
 void AvatarMenuBubbleView::OnAvatarMenuModelChanged(
     AvatarMenuModel* avatar_menu_model) {
   // Unset all our child view references and call RemoveAllChildViews() which
   // will actually delete them.
   add_profile_link_ = NULL;
   item_views_.clear();
@@ skipping 15 matching lines @@
   add_profile_link_ = new views::Link(
       l10n_util::GetStringUTF16(IDS_PROFILES_CREATE_NEW_PROFILE_LINK));
   add_profile_link_->set_listener(this);
   add_profile_link_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   add_profile_link_->SetBackgroundColor(color());
   add_profile_link_->SetEnabledColor(SkColorSetRGB(0xe3, 0xed, 0xf6));
   AddChildView(add_profile_link_);
 
   // If the bubble has already been shown then resize and reposition the bubble.
   Layout();
-  SizeToContents();
+  if (GetBubbleFrameView())
+    SizeToContents();
 }