Index: trunk/src/chrome/installer/setup/setup_main.cc |
=================================================================== |
--- trunk/src/chrome/installer/setup/setup_main.cc (revision 207822) |
+++ trunk/src/chrome/installer/setup/setup_main.cc (working copy) |
@@ -14,7 +14,6 @@ |
#include "base/command_line.h" |
#include "base/file_util.h" |
#include "base/file_version_info.h" |
-#include "base/files/file_path.h" |
#include "base/files/scoped_temp_dir.h" |
#include "base/path_service.h" |
#include "base/process_util.h" |
@@ -492,6 +491,7 @@ |
InstallerState* installer_state, |
installer::InstallStatus* status) { |
if (installer_state->FindProduct(BrowserDistribution::CHROME_APP_HOST)) { |
+ |
if (!installer_state->is_multi_install()) { |
LOG(DFATAL) << "App Launcher requires multi install"; |
*status = installer::APP_HOST_REQUIRES_MULTI_INSTALL; |
@@ -507,6 +507,7 @@ |
installer_state->WriteInstallerResult(*status, 0, NULL); |
return false; |
} |
+ |
} |
return true; |
@@ -1476,27 +1477,6 @@ |
} else if (cmd_line.HasSwitch(installer::switches::kChromeFrameQuickEnable)) { |
*exit_code = installer::ChromeFrameQuickEnable(original_state, |
installer_state); |
- } else if (cmd_line.HasSwitch(installer::switches::kPatch)) { |
- const std::string patch_type_str( |
- cmd_line.GetSwitchValueASCII(installer::switches::kPatch)); |
- const base::FilePath input_file( |
- cmd_line.GetSwitchValuePath(installer::switches::kInputFile)); |
- const base::FilePath patch_file( |
- cmd_line.GetSwitchValuePath(installer::switches::kPatchFile)); |
- const base::FilePath output_file( |
- cmd_line.GetSwitchValuePath(installer::switches::kOutputFile)); |
- |
- if (patch_type_str == installer::kCourgette) { |
- *exit_code = installer::CourgettePatchFiles(input_file, |
- patch_file, |
- output_file); |
- } else if (patch_type_str == installer::kBsdiff) { |
- *exit_code = installer::BsdiffPatchFiles(input_file, |
- patch_file, |
- output_file); |
- } else { |
- *exit_code = installer::PATCH_INVALID_ARGUMENTS; |
- } |
} else { |
handled = false; |
} |