summaryrefslogtreecommitdiffstats
path: root/chrome_frame/ready_mode
diff options
context:
space:
mode:
authorrobertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-26 19:46:26 +0000
committerrobertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-26 19:46:26 +0000
commit99372841aea3f058340e82a09c7f0d64a7d9ed47 (patch)
treecfe1c76fcfed564131432222d626edef7debbca0 /chrome_frame/ready_mode
parent5561a2f81f61f37604552f6c36c2d5b1a52336af (diff)
downloadchromium_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/ready_mode')
-rw-r--r--chrome_frame/ready_mode/internal/registry_ready_mode_state.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome_frame/ready_mode/internal/registry_ready_mode_state.cc b/chrome_frame/ready_mode/internal/registry_ready_mode_state.cc
index 3e16551..c9084ca 100644
--- a/chrome_frame/ready_mode/internal/registry_ready_mode_state.cc
+++ b/chrome_frame/ready_mode/internal/registry_ready_mode_state.cc
@@ -59,10 +59,9 @@ HANDLE LaunchCommandDirectly(const std::wstring& command_field) {
HANDLE LaunchCommandViaProcessLauncher(const std::wstring& command_field) {
HANDLE launched_process = NULL;
- scoped_ptr<CommandLine> command_line(
- chrome_launcher::CreateUpdateCommandLine(command_field));
-
- if (command_line != NULL) {
+ scoped_ptr<CommandLine> command_line;
+ if (chrome_launcher::CreateUpdateCommandLine(command_field, &command_line)) {
+ DCHECK(command_line != NULL);
base::LaunchOptions options;
options.start_hidden = true;
base::LaunchProcess(*command_line, options, &launched_process);