OLD | NEW |
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 <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 515 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
526 // well anyways. | 526 // well anyways. |
527 string16 html_prog_id(ShellUtil::kRegClasses); | 527 string16 html_prog_id(ShellUtil::kRegClasses); |
528 html_prog_id.push_back(FilePath::kSeparators[0]); | 528 html_prog_id.push_back(FilePath::kSeparators[0]); |
529 html_prog_id.append(ShellUtil::kChromeHTMLProgId); | 529 html_prog_id.append(ShellUtil::kChromeHTMLProgId); |
530 html_prog_id.append(browser_entry_suffix); | 530 html_prog_id.append(browser_entry_suffix); |
531 InstallUtil::DeleteRegistryKey(root, html_prog_id); | 531 InstallUtil::DeleteRegistryKey(root, html_prog_id); |
532 | 532 |
533 // Delete Software\Classes\Chrome (Same comment as above applies for this too) | 533 // Delete Software\Classes\Chrome (Same comment as above applies for this too) |
534 string16 chrome_app_id(ShellUtil::kRegClasses); | 534 string16 chrome_app_id(ShellUtil::kRegClasses); |
535 chrome_app_id.push_back(FilePath::kSeparators[0]); | 535 chrome_app_id.push_back(FilePath::kSeparators[0]); |
536 chrome_app_id.append(dist->GetBrowserAppId()); | 536 if (browser_entry_suffix.empty()) { |
| 537 // An unsuffixed appid used to be registered on some user-level install |
| 538 // (dev-channel 21.0.1171.0). Make sure it gets cleaned up here. |
| 539 // Note: this couldn't be cleaned on update as a currently running old |
| 540 // chrome might still be using the unsuffixed appid when the registration |
| 541 // update steps run. |
| 542 InstallUtil::DeleteRegistryKey(root, chrome_app_id + dist->GetBaseAppId()); |
| 543 } |
| 544 chrome_app_id.append(ShellUtil::GetBrowserModelId(dist, chrome_exe.value())); |
537 InstallUtil::DeleteRegistryKey(root, chrome_app_id); | 545 InstallUtil::DeleteRegistryKey(root, chrome_app_id); |
538 | 546 |
539 // Delete all Start Menu Internet registrations that refer to this Chrome. | 547 // Delete all Start Menu Internet registrations that refer to this Chrome. |
540 { | 548 { |
541 using base::win::RegistryKeyIterator; | 549 using base::win::RegistryKeyIterator; |
542 InstallUtil::ProgramCompare open_command_pred(chrome_exe); | 550 InstallUtil::ProgramCompare open_command_pred(chrome_exe); |
543 string16 client_name; | 551 string16 client_name; |
544 string16 client_key; | 552 string16 client_key; |
545 string16 open_key; | 553 string16 open_key; |
546 for (RegistryKeyIterator iter(root, ShellUtil::kRegStartMenuInternet); | 554 for (RegistryKeyIterator iter(root, ShellUtil::kRegStartMenuInternet); |
(...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
949 | 957 |
950 // Try and delete the preserved local state once the post-install | 958 // Try and delete the preserved local state once the post-install |
951 // operations are complete. | 959 // operations are complete. |
952 if (!backup_state_file.empty()) | 960 if (!backup_state_file.empty()) |
953 file_util::Delete(backup_state_file, false); | 961 file_util::Delete(backup_state_file, false); |
954 | 962 |
955 return ret; | 963 return ret; |
956 } | 964 } |
957 | 965 |
958 } // namespace installer | 966 } // namespace installer |
OLD | NEW |