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

Unified Diff: chrome/browser/component_updater/component_patcher_win.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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/component_updater/component_patcher_win.cc
diff --git a/chrome/browser/component_updater/component_patcher_win.cc b/chrome/browser/component_updater/component_patcher_win.cc
index 9e38c0cf10862ca1440b0a610e7a42765b40f318..8935f421329521f4f884c69072f0c37bafbeca2d 100644
--- a/chrome/browser/component_updater/component_patcher_win.cc
+++ b/chrome/browser/component_updater/component_patcher_win.cc
@@ -13,6 +13,7 @@
#include "base/process/kill.h"
#include "base/process/launch.h"
#include "base/strings/string_util.h"
+#include "base/strings/utf_string_conversions.h"
#include "base/win/scoped_handle.h"
#include "chrome/installer/util/util_constants.h"
@@ -39,8 +40,8 @@ base::FilePath FindSetupProgram() {
if (!PathService::Get(base::DIR_MODULE, &exe_dir))
return base::FilePath();
- const std::string installer_dir(WideToASCII(installer::kInstallerDir));
- const std::string setup_exe(WideToASCII(installer::kSetupExe));
+ const std::string installer_dir(base::UTF16ToASCII(installer::kInstallerDir));
+ const std::string setup_exe(base::UTF16ToASCII(installer::kSetupExe));
base::FilePath setup_path = exe_dir;
setup_path = setup_path.AppendASCII(installer_dir);
« no previous file with comments | « chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc ('k') | chrome/browser/devtools/adb/android_usb_device.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698