Chromium Code Reviews| 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 // This file contains the definitions of the installer functions that build | 5 // This file contains the definitions of the installer functions that build |
| 6 // the WorkItemList used to install the application. | 6 // the WorkItemList used to install the application. |
| 7 | 7 |
| 8 #include "chrome/installer/setup/install_worker.h" | 8 #include "chrome/installer/setup/install_worker.h" |
| 9 | 9 |
| 10 #include <oaidl.h> | 10 #include <oaidl.h> |
| (...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 181 cmd_key.append(1, L'\\').append(google_update::kRegCommandsKey) | 181 cmd_key.append(1, L'\\').append(google_update::kRegCommandsKey) |
| 182 .append(1, L'\\').append(kCmdInstallApp); | 182 .append(1, L'\\').append(kCmdInstallApp); |
| 183 | 183 |
| 184 if (installer_state.operation() == InstallerState::UNINSTALL) { | 184 if (installer_state.operation() == InstallerState::UNINSTALL) { |
| 185 work_item_list->AddDeleteRegKeyWorkItem( | 185 work_item_list->AddDeleteRegKeyWorkItem( |
| 186 installer_state.root_key(), cmd_key)->set_log_message( | 186 installer_state.root_key(), cmd_key)->set_log_message( |
| 187 "removing install-application command"); | 187 "removing install-application command"); |
| 188 } else { | 188 } else { |
| 189 CommandLine cmd_line( | 189 CommandLine cmd_line( |
| 190 installer_state.target_path().Append(installer::kChromeAppHostExe)); | 190 installer_state.target_path().Append(installer::kChromeAppHostExe)); |
| 191 cmd_line.AppendSwitchASCII(::switches::kAppsInstallFromManifestURL, "%1"); | 191 cmd_line.AppendSwitchASCII(::switches::kInstallFromWebstore, "%1"); |
|
gab
2012/09/18 16:44:21
According to the comments on those switches: kApps
asargent_no_longer_on_chrome
2012/09/18 16:59:14
This code was written in advance of chrome actuall
| |
| 192 | 192 |
| 193 AppCommand cmd(cmd_line.GetCommandLineString()); | 193 AppCommand cmd(cmd_line.GetCommandLineString()); |
| 194 cmd.set_sends_pings(true); | 194 cmd.set_sends_pings(true); |
| 195 cmd.set_is_web_accessible(true); | 195 cmd.set_is_web_accessible(true); |
| 196 cmd.AddWorkItems(installer_state.root_key(), cmd_key, work_item_list); | 196 cmd.AddWorkItems(installer_state.root_key(), cmd_key, work_item_list); |
| 197 } | 197 } |
| 198 } | 198 } |
| 199 | 199 |
| 200 void AddProductSpecificWorkItems(const InstallationState& original_state, | 200 void AddProductSpecificWorkItems(const InstallationState& original_state, |
| 201 const InstallerState& installer_state, | 201 const InstallerState& installer_state, |
| (...skipping 1391 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1593 // Log everything for now. | 1593 // Log everything for now. |
| 1594 cmd_line.AppendSwitch(installer::switches::kVerboseLogging); | 1594 cmd_line.AppendSwitch(installer::switches::kVerboseLogging); |
| 1595 | 1595 |
| 1596 AppCommand cmd(cmd_line.GetCommandLineString()); | 1596 AppCommand cmd(cmd_line.GetCommandLineString()); |
| 1597 cmd.set_is_auto_run_on_os_upgrade(true); | 1597 cmd.set_is_auto_run_on_os_upgrade(true); |
| 1598 cmd.AddWorkItems(installer_state.root_key(), cmd_key, install_list); | 1598 cmd.AddWorkItems(installer_state.root_key(), cmd_key, install_list); |
| 1599 } | 1599 } |
| 1600 } | 1600 } |
| 1601 | 1601 |
| 1602 } // namespace installer | 1602 } // namespace installer |
| OLD | NEW |