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

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

Issue 1321143002: Make GetCommandExecuteImplClsid return the CLSID as a string directly. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@a1_no_delegate_execute_win10
Patch Set: review:grt Created 5 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
« no previous file with comments | « no previous file | chrome/installer/util/browser_distribution.h » ('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 1237 matching lines...) Expand 10 before | Expand all | Expand 10 after
1248 DCHECK(set_msi_work_item); 1248 DCHECK(set_msi_work_item);
1249 set_msi_work_item->set_ignore_failure(true); 1249 set_msi_work_item->set_ignore_failure(true);
1250 set_msi_work_item->set_log_message("Could not write MSI marker!"); 1250 set_msi_work_item->set_log_message("Could not write MSI marker!");
1251 } 1251 }
1252 1252
1253 void AddDelegateExecuteWorkItems(const InstallerState& installer_state, 1253 void AddDelegateExecuteWorkItems(const InstallerState& installer_state,
1254 const base::FilePath& target_path, 1254 const base::FilePath& target_path,
1255 const Version& new_version, 1255 const Version& new_version,
1256 const Product& product, 1256 const Product& product,
1257 WorkItemList* list) { 1257 WorkItemList* list) {
1258 base::string16 handler_class_uuid;
1259 BrowserDistribution* dist = product.distribution(); 1258 BrowserDistribution* dist = product.distribution();
1260 if (!dist->GetCommandExecuteImplClsid(&handler_class_uuid)) { 1259 const base::string16 handler_class_uuid = dist->GetCommandExecuteImplClsid();
1260 if (handler_class_uuid.empty()) {
1261 if (InstallUtil::IsChromeSxSProcess()) { 1261 if (InstallUtil::IsChromeSxSProcess()) {
1262 CleanupBadCanaryDelegateExecuteRegistration(target_path, list); 1262 CleanupBadCanaryDelegateExecuteRegistration(target_path, list);
1263 } else { 1263 } else {
1264 VLOG(1) << "No DelegateExecute verb handler processing to do for " 1264 VLOG(1) << "No DelegateExecute verb handler processing to do for "
1265 << dist->GetDisplayName(); 1265 << dist->GetDisplayName();
1266 } 1266 }
1267 return; 1267 return;
1268 } 1268 }
1269 1269
1270 HKEY root = installer_state.root_key(); 1270 HKEY root = installer_state.root_key();
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
1479 // Unconditionally remove the legacy Quick Enable command from the binaries. 1479 // Unconditionally remove the legacy Quick Enable command from the binaries.
1480 // Do this even if multi-install Chrome isn't installed to ensure that it is 1480 // Do this even if multi-install Chrome isn't installed to ensure that it is
1481 // not left behind in any case. 1481 // not left behind in any case.
1482 work_item_list->AddDeleteRegKeyWorkItem( 1482 work_item_list->AddDeleteRegKeyWorkItem(
1483 installer_state.root_key(), cmd_key, KEY_WOW64_32KEY) 1483 installer_state.root_key(), cmd_key, KEY_WOW64_32KEY)
1484 ->set_log_message("removing " + base::UTF16ToASCII(kCmdQuickEnableCf) + 1484 ->set_log_message("removing " + base::UTF16ToASCII(kCmdQuickEnableCf) +
1485 " command"); 1485 " command");
1486 } 1486 }
1487 1487
1488 } // namespace installer 1488 } // namespace installer
OLDNEW
« no previous file with comments | « no previous file | chrome/installer/util/browser_distribution.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698