diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-26 19:46:26 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-26 19:46:26 +0000 |
| commit | 99372841aea3f058340e82a09c7f0d64a7d9ed47 (patch) | |
| tree | cfe1c76fcfed564131432222d626edef7debbca0 /chrome_frame/cfproxy_proxy.cc | |
| parent | 5561a2f81f61f37604552f6c36c2d5b1a52336af (diff) | |
| download | chromium_src-99372841aea3f058340e82a09c7f0d64a7d9ed47.zip chromium_src-99372841aea3f058340e82a09c7f0d64a7d9ed47.tar.gz chromium_src-99372841aea3f058340e82a09c7f0d64a7d9ed47.tar.bz2 | |
Remove the \servers build output directory and place Chrome Frame parts into the root output folder next to chrome.exe et al.
Also add a more helpful error message when failing to register the Chrome Frame dll.
Review URL: http://codereview.chromium.org/8013001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102780 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/cfproxy_proxy.cc')
| -rw-r--r-- | chrome_frame/cfproxy_proxy.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome_frame/cfproxy_proxy.cc b/chrome_frame/cfproxy_proxy.cc index bd38337..680588e 100644 --- a/chrome_frame/cfproxy_proxy.cc +++ b/chrome_frame/cfproxy_proxy.cc @@ -64,7 +64,7 @@ void CFProxy::InitInIoThread(const ProxyParams& params) { ipc_sender_ = api_->CreateChannel(channel_id, this); std::wstring cmd_line = BuildCmdLine(channel_id, params.profile_path, params.extra_params); - if (api_->LaunchApp(cmd_line)) { + if (!cmd_line.empty() && api_->LaunchApp(cmd_line)) { CancelableTask* launch_timeout = NewRunnableMethod(this, &CFProxy::LaunchTimeOut); ipc_thread_.message_loop()->PostDelayedTask(FROM_HERE, launch_timeout, |