| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/installer/util/chrome_browser_operations.h" | 5 #include "chrome/installer/util/chrome_browser_operations.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
| 9 #include "base/files/file_util.h" | 9 #include "base/files/file_util.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 options->insert(kOptionMultiInstall); | 43 options->insert(kOptionMultiInstall); |
| 44 } | 44 } |
| 45 | 45 |
| 46 void ChromeBrowserOperations::AddKeyFiles( | 46 void ChromeBrowserOperations::AddKeyFiles( |
| 47 const std::set<base::string16>& options, | 47 const std::set<base::string16>& options, |
| 48 std::vector<base::FilePath>* key_files) const { | 48 std::vector<base::FilePath>* key_files) const { |
| 49 DCHECK(key_files); | 49 DCHECK(key_files); |
| 50 key_files->push_back(base::FilePath(installer::kChromeDll)); | 50 key_files->push_back(base::FilePath(installer::kChromeDll)); |
| 51 } | 51 } |
| 52 | 52 |
| 53 void ChromeBrowserOperations::AddComDllList( | |
| 54 const std::set<base::string16>& options, | |
| 55 std::vector<base::FilePath>* com_dll_list) const { | |
| 56 } | |
| 57 | |
| 58 void ChromeBrowserOperations::AppendProductFlags( | 53 void ChromeBrowserOperations::AppendProductFlags( |
| 59 const std::set<base::string16>& options, | 54 const std::set<base::string16>& options, |
| 60 base::CommandLine* cmd_line) const { | 55 base::CommandLine* cmd_line) const { |
| 61 DCHECK(cmd_line); | 56 DCHECK(cmd_line); |
| 62 | 57 |
| 63 if (options.find(kOptionMultiInstall) != options.end()) { | 58 if (options.find(kOptionMultiInstall) != options.end()) { |
| 64 // Add --multi-install if it isn't already there. | 59 // Add --multi-install if it isn't already there. |
| 65 if (!cmd_line->HasSwitch(switches::kMultiInstall)) | 60 if (!cmd_line->HasSwitch(switches::kMultiInstall)) |
| 66 cmd_line->AppendSwitch(switches::kMultiInstall); | 61 cmd_line->AppendSwitch(switches::kMultiInstall); |
| 67 | 62 |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 133 const base::FilePath& setup_path, | 128 const base::FilePath& setup_path, |
| 134 const std::set<base::string16>& options, | 129 const std::set<base::string16>& options, |
| 135 InstallStatus status, | 130 InstallStatus status, |
| 136 bool system_level) const { | 131 bool system_level) const { |
| 137 base::CommandLine base_command(setup_path); | 132 base::CommandLine base_command(setup_path); |
| 138 AppendProductFlags(options, &base_command); | 133 AppendProductFlags(options, &base_command); |
| 139 installer::LaunchBrowserUserExperiment(base_command, status, system_level); | 134 installer::LaunchBrowserUserExperiment(base_command, status, system_level); |
| 140 } | 135 } |
| 141 | 136 |
| 142 } // namespace installer | 137 } // namespace installer |
| OLD | NEW |