summaryrefslogtreecommitdiffstats
path: root/chrome/browser/external_tab_container.h
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-23 00:57:50 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-23 00:57:50 +0000
commit9368547c6b4d4a41117f99c6616faad0921d613a (patch)
tree38999856a04346a31d1ec896cc59c01290b5a7a8 /chrome/browser/external_tab_container.h
parent883be7eb6ca869a87fa23e264a1a9905105c750e (diff)
downloadchromium_src-9368547c6b4d4a41117f99c6616faad0921d613a.zip
chromium_src-9368547c6b4d4a41117f99c6616faad0921d613a.tar.gz
chromium_src-9368547c6b4d4a41117f99c6616faad0921d613a.tar.bz2
Fix a Chrome crash reported in chrome frame reliability test runs. The crash happens when the ExternalTabContainer is destroyed
and it attempts to unregister the accelerators via the focus manager. The call to GetFocusManager which is implemented by the widget causes a pure virtual function error. I was able to repro this crash once and it looks like the ExternalTabContainer is valid at this point. Workaround is to remember the focus manager pointer during initialization and use the same during tear down. Should fix bug http://code.google.com/p/chromium/issues/detail?id=42365 Bug=42365 Review URL: http://codereview.chromium.org/1734007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45393 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/external_tab_container.h')
-rw-r--r--chrome/browser/external_tab_container.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/external_tab_container.h b/chrome/browser/external_tab_container.h
index eca66b1..c537839 100644
--- a/chrome/browser/external_tab_container.h
+++ b/chrome/browser/external_tab_container.h
@@ -331,6 +331,8 @@ class ExternalTabContainer : public TabContentsDelegate,
// Set to true if the ExternalTabContainer if infobars should be enabled.
bool infobars_enabled_;
+ views::FocusManager* focus_manager_;
+
DISALLOW_COPY_AND_ASSIGN(ExternalTabContainer);
};