diff options
Diffstat (limited to 'chrome_frame/chrome_frame_automation.cc')
| -rw-r--r-- | chrome_frame/chrome_frame_automation.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/chrome_frame/chrome_frame_automation.cc b/chrome_frame/chrome_frame_automation.cc index 9a649c0..12f14cf 100644 --- a/chrome_frame/chrome_frame_automation.cc +++ b/chrome_frame/chrome_frame_automation.cc @@ -134,7 +134,7 @@ class ChromeFrameAutomationProxyImpl::CFMsgDispatcher ChromeFrameAutomationProxyImpl::ChromeFrameAutomationProxyImpl( AutomationProxyCacheEntry* entry, - std::string channel_id, int launch_timeout) + std::string channel_id, base::TimeDelta launch_timeout) : AutomationProxy(launch_timeout, false), proxy_entry_(entry) { TRACE_EVENT_BEGIN_ETW("chromeframe.automationproxy", this, ""); @@ -251,8 +251,10 @@ void AutomationProxyCacheEntry::CreateProxy(ChromeFrameLaunchParams* params, // At same time we must destroy/stop the thread from another thread. std::string channel_id = AutomationProxy::GenerateChannelID(); ChromeFrameAutomationProxyImpl* proxy = - new ChromeFrameAutomationProxyImpl(this, channel_id, - params->launch_timeout()); + new ChromeFrameAutomationProxyImpl( + this, + channel_id, + base::TimeDelta::FromMilliseconds(params->launch_timeout())); // Ensure that the automation proxy actually respects our choice on whether // or not to check the version. |