Fix for crasher in canary. Avatar decoration in the win7 taskbar.

chrome/browser/ui/views/avatar_menu_button.cc

Index: chrome/browser/ui/views/avatar_menu_button.cc
===================================================================
--- chrome/browser/ui/views/avatar_menu_button.cc	(revision 99394)
+++ chrome/browser/ui/views/avatar_menu_button.cc	(working copy)
@@ -34,15 +34,20 @@
 #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);
   if (FAILED(result) || FAILED(taskbar->HrInit()))
     return;
-  gfx::NativeWindow window = browser->window()->GetNativeHandle();
-  if (!window)
-    return;
   HICON icon = NULL;
   if (bitmap) {
     // Since the target size is so small, we use our best resizer.