Fix top crasher on the AvatarMenuButton destructor

chrome/browser/ui/views/avatar_menu_button.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_button.h"
 
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/profile_menu_model.h"
 #include "chrome/browser/ui/views/avatar_menu_bubble_view.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
@@ skipping 16 matching lines @@
 // The Windows 7 taskbar supports dynamic overlays and effects, we use this
 // to ovelay the avatar icon there. The overlay only applies if the taskbar
 // is in "default large icon mode". This function is a best effort deal so
 // we bail out silently at any error condition.
 // See http://msdn.microsoft.com/en-us/library/dd391696(VS.85).aspx for
 // more information.
 void DrawTaskBarDecoration(const Browser* browser, const SkBitmap* bitmap) {
 #if defined(OS_WIN)
   if (base::win::GetVersion() < base::win::VERSION_WIN7)
     return;
-  // During destruction of the browser frame, we might not have a window
-  // so the taksbar button will be removed by windows anyway.
   BrowserWindow* bw = browser->window();
   if (!bw)
     return;
   gfx::NativeWindow window = bw->GetNativeHandle();
   if (!window)
     return;
 
   base::win::ScopedComPtr<ITaskbarList3> taskbar;
   HRESULT result = taskbar.CreateInstance(CLSID_TaskbarList, NULL,
                                           CLSCTX_INPROC_SERVER);
@@ skipping 19 matching lines @@
 AvatarMenuButton::AvatarMenuButton(Browser* browser, bool has_menu)
     : MenuButton(NULL, std::wstring(), this, false),
       browser_(browser),
       has_menu_(has_menu),
       set_taskbar_decoration_(false) {
   // In RTL mode, the avatar icon should be looking the opposite direction.
   EnableCanvasFlippingForRTLUI(true);
 }
 
 AvatarMenuButton::~AvatarMenuButton() {
+  // During destruction of the browser frame, we might not have a window
+  // so the taskbar button will be removed by windows anyway.
+  if (browser_->IsAttemptingToCloseBrowser())
+    return;
   DrawTaskBarDecoration(browser_, NULL);
 }
 
 void AvatarMenuButton::OnPaint(gfx::Canvas* canvas) {
   const SkBitmap& icon = GetImageToPaint();
   if (icon.isNull())
     return;
 
   // Scale the image to fit the width of the button.
   int dst_width = std::min(icon.width(), width());
@@ skipping 48 matching lines @@
   views::View::ConvertPointToScreen(this, &origin);
   gfx::Rect bounds(0, 0, width(), height());
   bounds.set_origin(origin);
 
   AvatarMenuBubbleView* bubble_view = new AvatarMenuBubbleView(browser_);
   // Bubble::Show() takes ownership of the view.
   Bubble::Show(browser_view->GetWidget(), bounds,
                views::BubbleBorder::TOP_LEFT,
                bubble_view, bubble_view);
 }