Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(835)

Unified Diff: chrome/browser/ui/views/avatar_menu_button.cc

Issue 7834013: Fix top crasher on the AvatarMenuButton destructor (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/avatar_menu_button.cc
===================================================================
--- chrome/browser/ui/views/avatar_menu_button.cc (revision 99454)
+++ chrome/browser/ui/views/avatar_menu_button.cc (working copy)
@@ -34,8 +34,6 @@
#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;
@@ -75,6 +73,10 @@
}
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);
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698