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

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

Issue 1294863006: Do not register Chrome's DelegateExecute on Win10+. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@d1_fix_debug_versioninfo
Patch Set: tweak IsChromeRegistered to support RemovalFlag 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/shell_util.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 1290 matching lines...) Expand 10 before | Expand all | Expand 10 after
1301 HKEY root = installer_state.root_key(); 1301 HKEY root = installer_state.root_key();
1302 base::string16 delegate_execute_path(L"Software\\Classes\\CLSID\\"); 1302 base::string16 delegate_execute_path(L"Software\\Classes\\CLSID\\");
1303 delegate_execute_path.append(handler_class_uuid); 1303 delegate_execute_path.append(handler_class_uuid);
1304 1304
1305 // Unconditionally remove registration regardless of whether or not it is 1305 // Unconditionally remove registration regardless of whether or not it is
1306 // needed since builds after r132190 included it when it wasn't strictly 1306 // needed since builds after r132190 included it when it wasn't strictly
1307 // necessary. Do this removal before adding in the new key to ensure that 1307 // necessary. Do this removal before adding in the new key to ensure that
1308 // the COM probe/flush below does its job. 1308 // the COM probe/flush below does its job.
1309 AddUninstallDelegateExecuteWorkItems(root, delegate_execute_path, list); 1309 AddUninstallDelegateExecuteWorkItems(root, delegate_execute_path, list);
1310 1310
1311 // Add work items to register the handler iff it is present. 1311 // See also shell_util.cc's GetChromeProgIdEntries.
1312 // See also shell_util.cc's GetProgIdEntries.
1313 if (installer_state.operation() != InstallerState::UNINSTALL) { 1312 if (installer_state.operation() != InstallerState::UNINSTALL) {
1314 VLOG(1) << "Adding registration items for DelegateExecute verb handler."; 1313 VLOG(1) << "Adding registration items for DelegateExecute verb handler.";
1315 1314
1316 // Force COM to flush its cache containing the path to the old handler. 1315 // Force COM to flush its cache containing the path to the old handler.
1317 list->AddCallbackWorkItem(base::Bind(&ProbeCommandExecuteCallback, 1316 list->AddCallbackWorkItem(base::Bind(&ProbeCommandExecuteCallback,
1318 handler_class_uuid)); 1317 handler_class_uuid));
1319 1318
1320 // The path to the exe (in the version directory). 1319 // The path to the exe (in the version directory).
1321 base::FilePath delegate_execute(target_path); 1320 base::FilePath delegate_execute(target_path);
1322 if (new_version.IsValid()) 1321 if (new_version.IsValid())
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
1511 // Unconditionally remove the legacy Quick Enable command from the binaries. 1510 // Unconditionally remove the legacy Quick Enable command from the binaries.
1512 // Do this even if multi-install Chrome isn't installed to ensure that it is 1511 // Do this even if multi-install Chrome isn't installed to ensure that it is
1513 // not left behind in any case. 1512 // not left behind in any case.
1514 work_item_list->AddDeleteRegKeyWorkItem( 1513 work_item_list->AddDeleteRegKeyWorkItem(
1515 installer_state.root_key(), cmd_key, KEY_WOW64_32KEY) 1514 installer_state.root_key(), cmd_key, KEY_WOW64_32KEY)
1516 ->set_log_message("removing " + base::UTF16ToASCII(kCmdQuickEnableCf) + 1515 ->set_log_message("removing " + base::UTF16ToASCII(kCmdQuickEnableCf) +
1517 " command"); 1516 " command");
1518 } 1517 }
1519 1518
1520 } // namespace installer 1519 } // namespace installer
OLDNEW
« no previous file with comments | « no previous file | chrome/installer/util/shell_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698