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

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

Issue 176843022: Move UTF16ToASCII, remove WideToASCII. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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 | Annotate | Revision Log
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 10
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 void ClearRlzProductState() { 169 void ClearRlzProductState() {
170 const rlz_lib::AccessPoint points[] = {rlz_lib::CHROME_OMNIBOX, 170 const rlz_lib::AccessPoint points[] = {rlz_lib::CHROME_OMNIBOX,
171 rlz_lib::CHROME_HOME_PAGE, 171 rlz_lib::CHROME_HOME_PAGE,
172 rlz_lib::NO_ACCESS_POINT}; 172 rlz_lib::NO_ACCESS_POINT};
173 173
174 rlz_lib::ClearProductState(rlz_lib::CHROME, points); 174 rlz_lib::ClearProductState(rlz_lib::CHROME, points);
175 175
176 // If chrome has been reactivated, clear all events for this brand as well. 176 // If chrome has been reactivated, clear all events for this brand as well.
177 base::string16 reactivation_brand_wide; 177 base::string16 reactivation_brand_wide;
178 if (GoogleUpdateSettings::GetReactivationBrand(&reactivation_brand_wide)) { 178 if (GoogleUpdateSettings::GetReactivationBrand(&reactivation_brand_wide)) {
179 std::string reactivation_brand(WideToASCII(reactivation_brand_wide)); 179 std::string reactivation_brand(base::UTF16ToASCII(reactivation_brand_wide));
180 rlz_lib::SupplementaryBranding branding(reactivation_brand.c_str()); 180 rlz_lib::SupplementaryBranding branding(reactivation_brand.c_str());
181 rlz_lib::ClearProductState(rlz_lib::CHROME, points); 181 rlz_lib::ClearProductState(rlz_lib::CHROME, points);
182 } 182 }
183 } 183 }
184 184
185 // Decides whether setup.exe and the installer archive should be removed based 185 // Decides whether setup.exe and the installer archive should be removed based
186 // on the original and installer states: 186 // on the original and installer states:
187 // * non-multi product being uninstalled: remove both 187 // * non-multi product being uninstalled: remove both
188 // * any multi product left besides App Host: keep both 188 // * any multi product left besides App Host: keep both
189 // * only App Host left: keep setup.exe 189 // * only App Host left: keep setup.exe
(...skipping 1244 matching lines...) Expand 10 before | Expand all | Expand 10 after
1434 // If we need a reboot to continue, schedule the parent directories for 1434 // If we need a reboot to continue, schedule the parent directories for
1435 // deletion unconditionally. If they are not empty, the session manager 1435 // deletion unconditionally. If they are not empty, the session manager
1436 // will not delete them on reboot. 1436 // will not delete them on reboot.
1437 ScheduleParentAndGrandparentForDeletion(target_path); 1437 ScheduleParentAndGrandparentForDeletion(target_path);
1438 } else if (DeleteChromeDirectoriesIfEmpty(target_path) == DELETE_FAILED) { 1438 } else if (DeleteChromeDirectoriesIfEmpty(target_path) == DELETE_FAILED) {
1439 *uninstall_status = UNINSTALL_FAILED; 1439 *uninstall_status = UNINSTALL_FAILED;
1440 } 1440 }
1441 } 1441 }
1442 1442
1443 } // namespace installer 1443 } // namespace installer
OLDNEW
« no previous file with comments | « chrome/installer/setup/setup_util.cc ('k') | chrome/installer/test/alternate_version_generator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698