diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-21 22:20:37 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-21 22:20:37 +0000 |
| commit | f1c74ecbdfbe62d62668bdbeb7639284f0b455f4 (patch) | |
| tree | becddf68a03b59c4a4d670a29e93a7292c8c51ad /chrome | |
| parent | 9ddaa612154e9202970742f44446d3858bbf1309 (diff) | |
| download | chromium_src-f1c74ecbdfbe62d62668bdbeb7639284f0b455f4.zip chromium_src-f1c74ecbdfbe62d62668bdbeb7639284f0b455f4.tar.gz chromium_src-f1c74ecbdfbe62d62668bdbeb7639284f0b455f4.tar.bz2 | |
Fix a chrome crash seen at times in chrome frame reliability test runs. It appears that the crash occurs because we attempt to
unregister focus manager accelerators registered by the external tab container twice as the Uninitialize function gets invoked
twice in WM_DESTROY and in the destructor.
Fix is to set the focus_manager_ pointer to NULL after unregistering the accelerators.
Bug=42365
Review URL: http://codereview.chromium.org/2069015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47958 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/external_tab_container.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/browser/external_tab_container.cc b/chrome/browser/external_tab_container.cc index e9edb11..432f277 100644 --- a/chrome/browser/external_tab_container.cc +++ b/chrome/browser/external_tab_container.cc @@ -183,6 +183,7 @@ void ExternalTabContainer::Uninitialize() { if (focus_manager_) { focus_manager_->UnregisterAccelerators(this); + focus_manager_ = NULL; } request_context_ = NULL; |