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

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

Issue 10837128: Temporarily ifdef out Active Setup for M22 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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
« no previous file with comments | « no previous file | chrome/installer/setup/uninstall.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 880 matching lines...) Expand 10 before | Expand all | Expand 10 after
891 891
892 AddUninstallShortcutWorkItems(installer_state, setup_path, new_version, 892 AddUninstallShortcutWorkItems(installer_state, setup_path, new_version,
893 install_list, *product); 893 install_list, *product);
894 894
895 AddVersionKeyWorkItems(root, product->distribution(), new_version, 895 AddVersionKeyWorkItems(root, product->distribution(), new_version,
896 add_language_identifier, install_list); 896 add_language_identifier, install_list);
897 897
898 AddDelegateExecuteWorkItems(installer_state, src_path, new_version, 898 AddDelegateExecuteWorkItems(installer_state, src_path, new_version,
899 *product, install_list); 899 *product, install_list);
900 900
901 // TODO(gab): This is only disabled for M22 as the shortcut CL using Active
902 // Setup will not make it in M22.
903 #if 0
901 AddActiveSetupWorkItems(installer_state, new_version, *product, 904 AddActiveSetupWorkItems(installer_state, new_version, *product,
902 install_list); 905 install_list);
906 #endif
903 } 907 }
904 908
905 // Add any remaining work items that involve special settings for 909 // Add any remaining work items that involve special settings for
906 // each product. 910 // each product.
907 AddProductSpecificWorkItems(original_state, installer_state, setup_path, 911 AddProductSpecificWorkItems(original_state, installer_state, setup_path,
908 new_version, install_list); 912 new_version, install_list);
909 913
910 // Copy over brand, usagestats, and other values. 914 // Copy over brand, usagestats, and other values.
911 AddGoogleUpdateWorkItems(original_state, installer_state, install_list); 915 AddGoogleUpdateWorkItems(original_state, installer_state, install_list);
912 916
(...skipping 660 matching lines...) Expand 10 before | Expand all | Expand 10 after
1573 machine_state, 1577 machine_state,
1574 setup_path, 1578 setup_path,
1575 new_version, 1579 new_version,
1576 work_item_list, 1580 work_item_list,
1577 false, // have_child_product 1581 false, // have_child_product
1578 cmd_line, 1582 cmd_line,
1579 kCmdQuickEnableApplicationHost); 1583 kCmdQuickEnableApplicationHost);
1580 } 1584 }
1581 1585
1582 } // namespace installer 1586 } // namespace installer
OLDNEW
« no previous file with comments | « no previous file | chrome/installer/setup/uninstall.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698