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

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

Issue 2224843002: Fix broken installer tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@kill_al_win
Patch Set: 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
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 12 matching lines...) Expand all
23 #include "base/strings/string_number_conversions.h" 23 #include "base/strings/string_number_conversions.h"
24 #include "base/strings/string_util.h" 24 #include "base/strings/string_util.h"
25 #include "base/strings/utf_string_conversions.h" 25 #include "base/strings/utf_string_conversions.h"
26 #include "base/win/registry.h" 26 #include "base/win/registry.h"
27 #include "base/win/scoped_handle.h" 27 #include "base/win/scoped_handle.h"
28 #include "base/win/shortcut.h" 28 #include "base/win/shortcut.h"
29 #include "base/win/windows_version.h" 29 #include "base/win/windows_version.h"
30 #include "chrome/common/chrome_constants.h" 30 #include "chrome/common/chrome_constants.h"
31 #include "chrome/common/chrome_paths.h" 31 #include "chrome/common/chrome_paths.h"
32 #include "chrome/common/chrome_result_codes.h" 32 #include "chrome/common/chrome_result_codes.h"
33 #include "chrome/installer/setup/app_launcher_installer.h"
34 #include "chrome/installer/setup/install.h" 33 #include "chrome/installer/setup/install.h"
35 #include "chrome/installer/setup/install_worker.h" 34 #include "chrome/installer/setup/install_worker.h"
36 #include "chrome/installer/setup/setup_constants.h" 35 #include "chrome/installer/setup/setup_constants.h"
37 #include "chrome/installer/setup/setup_util.h" 36 #include "chrome/installer/setup/setup_util.h"
38 #include "chrome/installer/setup/user_hive_visitor.h" 37 #include "chrome/installer/setup/user_hive_visitor.h"
39 #include "chrome/installer/util/auto_launch_util.h" 38 #include "chrome/installer/util/auto_launch_util.h"
40 #include "chrome/installer/util/browser_distribution.h" 39 #include "chrome/installer/util/browser_distribution.h"
41 #include "chrome/installer/util/channel_info.h" 40 #include "chrome/installer/util/channel_info.h"
42 #include "chrome/installer/util/delete_after_reboot_helper.h" 41 #include "chrome/installer/util/delete_after_reboot_helper.h"
43 #include "chrome/installer/util/firewall_manager_win.h" 42 #include "chrome/installer/util/firewall_manager_win.h"
(...skipping 1330 matching lines...) Expand 10 before | Expand all | Expand 10 after
1374 // If we need a reboot to continue, schedule the parent directories for 1373 // If we need a reboot to continue, schedule the parent directories for
1375 // deletion unconditionally. If they are not empty, the session manager 1374 // deletion unconditionally. If they are not empty, the session manager
1376 // will not delete them on reboot. 1375 // will not delete them on reboot.
1377 ScheduleParentAndGrandparentForDeletion(target_path); 1376 ScheduleParentAndGrandparentForDeletion(target_path);
1378 } else if (DeleteChromeDirectoriesIfEmpty(target_path) == DELETE_FAILED) { 1377 } else if (DeleteChromeDirectoriesIfEmpty(target_path) == DELETE_FAILED) {
1379 *uninstall_status = UNINSTALL_FAILED; 1378 *uninstall_status = UNINSTALL_FAILED;
1380 } 1379 }
1381 } 1380 }
1382 1381
1383 } // namespace installer 1382 } // namespace installer
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698