diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-10 22:40:50 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-10 22:40:50 +0000 |
| commit | 7f8a0be084f916a551817a900f982049f1952a05 (patch) | |
| tree | ce9111068f6a5d9273067997fb4ca6d5df809298 /chrome/browser | |
| parent | b23bb0744f55f165f394483c5167a94815161147 (diff) | |
| download | chromium_src-7f8a0be084f916a551817a900f982049f1952a05.zip chromium_src-7f8a0be084f916a551817a900f982049f1952a05.tar.gz chromium_src-7f8a0be084f916a551817a900f982049f1952a05.tar.bz2 | |
Fix UMR caused by ActiveWindowWatcher.
As spotted by the valgrind ui_tests buildbot.
BUG=16473
Review URL: http://codereview.chromium.org/149486
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20428 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/gtk/browser_window_gtk.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc index 8240747..fc5780b 100644 --- a/chrome/browser/gtk/browser_window_gtk.cc +++ b/chrome/browser/gtk/browser_window_gtk.cc @@ -809,6 +809,10 @@ void BrowserWindowGtk::Observe(NotificationType type, } case NotificationType::ACTIVE_WINDOW_CHANGED: { + // Do nothing if we're in the process of closing the browser window. + if (!window_) + break; + const GdkWindow* active_window = Details<const GdkWindow>(details).ptr(); bool is_active = (GTK_WIDGET(window_)->window == active_window); bool changed = (is_active != is_active_); |