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

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

Issue 14711006: Quick fix to get 7DA counts for unified Chrome / App Launcher. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixing mix-up between InstallationState and InstallationLevel. Created 7 years, 7 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 1205 matching lines...) Expand 10 before | Expand all | Expand 10 after
1216 AddVersionKeyWorkItems(root, product.distribution(), new_version, 1216 AddVersionKeyWorkItems(root, product.distribution(), new_version,
1217 add_language_identifier, install_list); 1217 add_language_identifier, install_list);
1218 1218
1219 AddDelegateExecuteWorkItems(installer_state, target_path, new_version, 1219 AddDelegateExecuteWorkItems(installer_state, target_path, new_version,
1220 product, install_list); 1220 product, install_list);
1221 1221
1222 AddActiveSetupWorkItems(installer_state, setup_path, new_version, product, 1222 AddActiveSetupWorkItems(installer_state, setup_path, new_version, product,
1223 install_list); 1223 install_list);
1224 } 1224 }
1225 1225
1226 // TODO(huangs): Implement actual migration code and remove the hack below.
1227 // If installing Chrome without the legacy stand-alone App Launcher (to be
1228 // handled later), add "shadow" App Launcher registry keys so Google Update
1229 // would recognize the "dr" value in the App Launcher ClientState key.
1230 // Checking .is_multi_install() excludes Chrome Canary and stand-alone Chrome.
1231 if (installer_state.is_multi_install() &&
1232 installer_state.FindProduct(BrowserDistribution::CHROME_BROWSER) &&
1233 !installer_state.FindProduct(BrowserDistribution::CHROME_APP_HOST)) {
1234 BrowserDistribution* shadow_app_launcher_dist =
1235 BrowserDistribution::GetSpecificDistribution(
1236 BrowserDistribution::CHROME_APP_HOST);
1237 AddVersionKeyWorkItems(root, shadow_app_launcher_dist, new_version,
1238 add_language_identifier, install_list);
1239 }
1240
1226 // Add any remaining work items that involve special settings for 1241 // Add any remaining work items that involve special settings for
1227 // each product. 1242 // each product.
1228 AddProductSpecificWorkItems(original_state, installer_state, setup_path, 1243 AddProductSpecificWorkItems(original_state, installer_state, setup_path,
1229 new_version, install_list); 1244 new_version, install_list);
1230 1245
1231 // Copy over brand, usagestats, and other values. 1246 // Copy over brand, usagestats, and other values.
1232 AddGoogleUpdateWorkItems(original_state, installer_state, install_list); 1247 AddGoogleUpdateWorkItems(original_state, installer_state, install_list);
1233 1248
1234 // Append the tasks that run after the installation. 1249 // Append the tasks that run after the installation.
1235 AppendPostInstallTasks(installer_state, 1250 AppendPostInstallTasks(installer_state,
(...skipping 461 matching lines...) Expand 10 before | Expand all | Expand 10 after
1697 if (installer_state.system_install()) 1712 if (installer_state.system_install())
1698 cmd_line.AppendSwitch(switches::kSystemLevel); 1713 cmd_line.AppendSwitch(switches::kSystemLevel);
1699 AppCommand cmd(cmd_line.GetCommandLineString()); 1714 AppCommand cmd(cmd_line.GetCommandLineString());
1700 cmd.set_sends_pings(true); 1715 cmd.set_sends_pings(true);
1701 cmd.set_is_web_accessible(true); 1716 cmd.set_is_web_accessible(true);
1702 cmd.AddWorkItems(installer_state.root_key(), cmd_key, work_item_list); 1717 cmd.AddWorkItems(installer_state.root_key(), cmd_key, work_item_list);
1703 } 1718 }
1704 } 1719 }
1705 1720
1706 } // namespace installer 1721 } // namespace installer
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/app_list/app_list_controller_win.cc ('k') | chrome/installer/setup/uninstall.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698