diff options
| author | stoyan@chromium.org <stoyan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-26 22:21:04 +0000 |
|---|---|---|
| committer | stoyan@chromium.org <stoyan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-26 22:21:04 +0000 |
| commit | a21f65f36474d39b95b3b16aad15f6c7abbc8fb6 (patch) | |
| tree | e00b0e0b814eb430ee345a54db316715273010e9 /chrome_frame | |
| parent | dcb3070302b8ee07a3d1dbfc290a84d325c7a6e3 (diff) | |
| download | chromium_src-a21f65f36474d39b95b3b16aad15f6c7abbc8fb6.zip chromium_src-a21f65f36474d39b95b3b16aad15f6c7abbc8fb6.tar.gz chromium_src-a21f65f36474d39b95b3b16aad15f6c7abbc8fb6.tar.bz2 | |
Fix crash in ChromeFrame if chrome launch timeouts.
BUG=60550
Review URL: http://codereview.chromium.org/4096003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63958 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/chrome_frame_automation.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome_frame/chrome_frame_automation.cc b/chrome_frame/chrome_frame_automation.cc index 9f62523..35f36e7 100644 --- a/chrome_frame/chrome_frame_automation.cc +++ b/chrome_frame/chrome_frame_automation.cc @@ -1057,8 +1057,6 @@ void ChromeFrameAutomationClient::AutomationServerDied() { void ChromeFrameAutomationClient::InitializeComplete( AutomationLaunchResult result) { DCHECK_EQ(PlatformThread::CurrentId(), ui_thread_id_); - std::string version = automation_server_->server_version(); - if (result != AUTOMATION_SUCCESS) { DLOG(WARNING) << "InitializeComplete: failure " << result; ReleaseAutomationServer(); @@ -1081,6 +1079,9 @@ void ChromeFrameAutomationClient::InitializeComplete( if (result == AUTOMATION_SUCCESS) { chrome_frame_delegate_->OnAutomationServerReady(); } else { + std::string version; + if (automation_server_) + version = automation_server_->server_version(); chrome_frame_delegate_->OnAutomationServerLaunchFailed(result, version); } } |