diff options
| author | mirandac@google.com <mirandac@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-17 20:17:36 +0000 |
|---|---|---|
| committer | mirandac@google.com <mirandac@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-17 20:17:36 +0000 |
| commit | 18fca4e1db6dcb0077b56c40725c960c4f0d043c (patch) | |
| tree | 25a654cae321a4d11526cf5fa9d2ab6461b288c7 /chrome/browser/external_tab_container.cc | |
| parent | f345876ca7aac5ff6f4e08242891b800c48cedcd (diff) | |
| download | chromium_src-18fca4e1db6dcb0077b56c40725c960c4f0d043c.zip chromium_src-18fca4e1db6dcb0077b56c40725c960c4f0d043c.tar.gz chromium_src-18fca4e1db6dcb0077b56c40725c960c4f0d043c.tar.bz2 | |
Revert 34855 - Fix a crash in ChromeFrame caused by incorrectly instantiating the automation url request context used
by the host network stack implementation with a NULL AutomationResourceMessageFilter pointer.
Fixes bug http://code.google.com/p/chromium/issues/detail?id=29025
Will add a test for this in a subsequent CL.
Bug=29025
Review URL: http://codereview.chromium.org/505033
TBR=ananta@chromium.org
Review URL: http://codereview.chromium.org/501087
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34868 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/external_tab_container.cc')
| -rw-r--r-- | chrome/browser/external_tab_container.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/external_tab_container.cc b/chrome/browser/external_tab_container.cc index 716b8ef..2775960 100644 --- a/chrome/browser/external_tab_container.cc +++ b/chrome/browser/external_tab_container.cc @@ -187,8 +187,6 @@ bool ExternalTabContainer::Reinitialize( automation_resource_message_filter_ = filter; if (load_requests_via_automation_) { - InitializeAutomationRequestContext(tab_handle_); - RenderViewHost* rvh = tab_contents_->render_view_host(); if (rvh) { AutomationResourceMessageFilter::RegisterRenderView( @@ -208,6 +206,9 @@ bool ExternalTabContainer::Reinitialize( void ExternalTabContainer::SetTabHandle(int handle) { tab_handle_ = handle; + if (load_requests_via_automation_) { + InitializeAutomationRequestContext(handle); + } } void ExternalTabContainer::ProcessUnhandledAccelerator(const MSG& msg) { |