Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Side by Side Diff: chrome/installer/setup/install_worker.cc

Issue 10957016: Ensuring Google Update at user-level is installed alongside App Host, for the quick-enable App Host… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixing nits. Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 1529 matching lines...) Expand 10 before | Expand all | Expand 10 after
1540 const InstallerState& installer_state, 1540 const InstallerState& installer_state,
1541 const InstallationState& machine_state, 1541 const InstallationState& machine_state,
1542 const FilePath& setup_path, 1542 const FilePath& setup_path,
1543 const Version& new_version, 1543 const Version& new_version,
1544 WorkItemList* work_item_list) { 1544 WorkItemList* work_item_list) {
1545 DCHECK(work_item_list); 1545 DCHECK(work_item_list);
1546 1546
1547 CommandLine cmd_line(CommandLine::NO_PROGRAM); 1547 CommandLine cmd_line(CommandLine::NO_PROGRAM);
1548 cmd_line.AppendSwitch(switches::kMultiInstall); 1548 cmd_line.AppendSwitch(switches::kMultiInstall);
1549 cmd_line.AppendSwitch(switches::kChromeAppHost); 1549 cmd_line.AppendSwitch(switches::kChromeAppHost);
1550 cmd_line.AppendSwitch(switches::kEnsureGoogleUpdatePresent);
1550 1551
1551 // For system-level binaries there is no way to keep the command state in sync 1552 // For system-level binaries there is no way to keep the command state in sync
1552 // with the installation/uninstallation of the Application Host (which is 1553 // with the installation/uninstallation of the Application Host (which is
1553 // always at user-level). 1554 // always at user-level).
1554 // So we pass false for 'have_child_product' to cause this command to always 1555 // So we pass false for 'have_child_product' to cause this command to always
1555 // be installed if the Chrome Binaries are installed. 1556 // be installed if the Chrome Binaries are installed.
1556 AddGenericQuickEnableWorkItems(installer_state, 1557 AddGenericQuickEnableWorkItems(installer_state,
1557 machine_state, 1558 machine_state,
1558 setup_path, 1559 setup_path,
1559 new_version, 1560 new_version,
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
1593 // Log everything for now. 1594 // Log everything for now.
1594 cmd_line.AppendSwitch(installer::switches::kVerboseLogging); 1595 cmd_line.AppendSwitch(installer::switches::kVerboseLogging);
1595 1596
1596 AppCommand cmd(cmd_line.GetCommandLineString()); 1597 AppCommand cmd(cmd_line.GetCommandLineString());
1597 cmd.set_is_auto_run_on_os_upgrade(true); 1598 cmd.set_is_auto_run_on_os_upgrade(true);
1598 cmd.AddWorkItems(installer_state.root_key(), cmd_key, install_list); 1599 cmd.AddWorkItems(installer_state.root_key(), cmd_key, install_list);
1599 } 1600 }
1600 } 1601 }
1601 1602
1602 } // namespace installer 1603 } // namespace installer
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698