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

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

Issue 23258005: Give SxS distribution its own registration GUIDs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove magic key combo from browser_options_handler.cc Created 7 years, 3 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
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 1417 matching lines...) Expand 10 before | Expand all | Expand 10 after
1428 } 1428 }
1429 } 1429 }
1430 1430
1431 void AddDelegateExecuteWorkItems(const InstallerState& installer_state, 1431 void AddDelegateExecuteWorkItems(const InstallerState& installer_state,
1432 const base::FilePath& target_path, 1432 const base::FilePath& target_path,
1433 const Version& new_version, 1433 const Version& new_version,
1434 const Product& product, 1434 const Product& product,
1435 WorkItemList* list) { 1435 WorkItemList* list) {
1436 string16 handler_class_uuid; 1436 string16 handler_class_uuid;
1437 BrowserDistribution* dist = product.distribution(); 1437 BrowserDistribution* dist = product.distribution();
1438 if (!dist->GetCommandExecuteImplClsid(&handler_class_uuid)) { 1438 if (!dist->GetCommandExecuteImplClsidString(&handler_class_uuid)) {
1439 if (InstallUtil::IsChromeSxSProcess()) { 1439 if (InstallUtil::IsChromeSxSProcess()) {
1440 CleanupBadCanaryDelegateExecuteRegistration(target_path, list); 1440 CleanupBadCanaryDelegateExecuteRegistration(target_path, list);
1441 } else { 1441 } else {
1442 VLOG(1) << "No DelegateExecute verb handler processing to do for " 1442 VLOG(1) << "No DelegateExecute verb handler processing to do for "
1443 << dist->GetDisplayName(); 1443 << dist->GetDisplayName();
1444 } 1444 }
1445 return; 1445 return;
1446 } 1446 }
1447 1447
1448 HKEY root = installer_state.root_key(); 1448 HKEY root = installer_state.root_key();
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
1712 if (installer_state.system_install()) 1712 if (installer_state.system_install())
1713 cmd_line.AppendSwitch(switches::kSystemLevel); 1713 cmd_line.AppendSwitch(switches::kSystemLevel);
1714 AppCommand cmd(cmd_line.GetCommandLineString()); 1714 AppCommand cmd(cmd_line.GetCommandLineString());
1715 cmd.set_sends_pings(true); 1715 cmd.set_sends_pings(true);
1716 cmd.set_is_web_accessible(true); 1716 cmd.set_is_web_accessible(true);
1717 cmd.AddWorkItems(installer_state.root_key(), cmd_key, work_item_list); 1717 cmd.AddWorkItems(installer_state.root_key(), cmd_key, work_item_list);
1718 } 1718 }
1719 } 1719 }
1720 1720
1721 } // namespace installer 1721 } // namespace installer
OLDNEW
« no previous file with comments | « no previous file | chrome/installer/setup/uninstall.cc » ('j') | chrome/installer/util/browser_distribution.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698