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

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

Issue 2163803003: [chrome_elf] Removing blacklist finch for dynamic dll changes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Review fixes. Created 4 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
« no previous file with comments | « chrome/browser/win/chrome_elf_init_unittest.cc ('k') | chrome_elf/blacklist/blacklist.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 defines the methods useful for uninstalling Chrome. 5 // This file defines the methods useful for uninstalling Chrome.
6 6
7 #include "chrome/installer/setup/uninstall.h" 7 #include "chrome/installer/setup/uninstall.h"
8 8
9 #include <windows.h> 9 #include <windows.h>
10 #include <stddef.h> 10 #include <stddef.h>
(...skipping 768 matching lines...) Expand 10 before | Expand all | Expand 10 after
779 779
780 // Removes the persistent blacklist state for the current user. Note: this will 780 // Removes the persistent blacklist state for the current user. Note: this will
781 // not remove the state for users other than the one uninstalling Chrome on a 781 // not remove the state for users other than the one uninstalling Chrome on a
782 // system-level install (http://crbug.com/388725). Doing so would require 782 // system-level install (http://crbug.com/388725). Doing so would require
783 // extracting the per-user registry hive iteration from 783 // extracting the per-user registry hive iteration from
784 // UninstallActiveSetupEntries so that it could service multiple tasks. 784 // UninstallActiveSetupEntries so that it could service multiple tasks.
785 void RemoveBlacklistState() { 785 void RemoveBlacklistState() {
786 InstallUtil::DeleteRegistryKey(HKEY_CURRENT_USER, 786 InstallUtil::DeleteRegistryKey(HKEY_CURRENT_USER,
787 blacklist::kRegistryBeaconPath, 787 blacklist::kRegistryBeaconPath,
788 0); // wow64_access 788 0); // wow64_access
789 // The following key is no longer used (https://crbug.com/631771).
790 // This cleanup is being left in for a time though.
791 #if defined(GOOGLE_CHROME_BUILD)
792 const wchar_t kRegistryFinchListPath[] =
793 L"SOFTWARE\\Google\\Chrome\\BLFinchList";
794 #else
795 const wchar_t kRegistryFinchListPath[] =
796 L"SOFTWARE\\Chromium\\BLFinchList";
797 #endif
789 InstallUtil::DeleteRegistryKey(HKEY_CURRENT_USER, 798 InstallUtil::DeleteRegistryKey(HKEY_CURRENT_USER,
790 blacklist::kRegistryFinchListPath, 799 kRegistryFinchListPath,
791 0); // wow64_access 800 0); // wow64_access
792 } 801 }
793 802
794 // Removes the persistent state for |distribution| for the current user. Note: 803 // Removes the persistent state for |distribution| for the current user. Note:
795 // this will not remove the state for users other than the one uninstalling 804 // this will not remove the state for users other than the one uninstalling
796 // Chrome on a system-level install; see RemoveBlacklistState for details. 805 // Chrome on a system-level install; see RemoveBlacklistState for details.
797 void RemoveDistributionRegistryState(BrowserDistribution* distribution) { 806 void RemoveDistributionRegistryState(BrowserDistribution* distribution) {
798 // Binaries do not store per-user state. 807 // Binaries do not store per-user state.
799 if (distribution->GetType() != BrowserDistribution::CHROME_BINARIES) { 808 if (distribution->GetType() != BrowserDistribution::CHROME_BINARIES) {
800 static const base::char16* const kKeysToPreserve[] = { 809 static const base::char16* const kKeysToPreserve[] = {
(...skipping 569 matching lines...) Expand 10 before | Expand all | Expand 10 after
1370 // If we need a reboot to continue, schedule the parent directories for 1379 // If we need a reboot to continue, schedule the parent directories for
1371 // deletion unconditionally. If they are not empty, the session manager 1380 // deletion unconditionally. If they are not empty, the session manager
1372 // will not delete them on reboot. 1381 // will not delete them on reboot.
1373 ScheduleParentAndGrandparentForDeletion(target_path); 1382 ScheduleParentAndGrandparentForDeletion(target_path);
1374 } else if (DeleteChromeDirectoriesIfEmpty(target_path) == DELETE_FAILED) { 1383 } else if (DeleteChromeDirectoriesIfEmpty(target_path) == DELETE_FAILED) {
1375 *uninstall_status = UNINSTALL_FAILED; 1384 *uninstall_status = UNINSTALL_FAILED;
1376 } 1385 }
1377 } 1386 }
1378 1387
1379 } // namespace installer 1388 } // namespace installer
OLDNEW
« no previous file with comments | « chrome/browser/win/chrome_elf_init_unittest.cc ('k') | chrome_elf/blacklist/blacklist.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698