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

Unified Diff: chrome/installer/util/language_selector.cc

Issue 371753002: Installer refactoring: using string16 instead of wstring for GoogleUpdateSettings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Using the proper UTF16 conversion routines; variable renaming. Created 6 years, 5 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
« no previous file with comments | « chrome/installer/util/google_update_settings_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/util/language_selector.cc
diff --git a/chrome/installer/util/language_selector.cc b/chrome/installer/util/language_selector.cc
index 0dc3f58c5e344dff81e1a7a6963e452f8964a739..a58048d6dbab2abe77394461fcf793365bbd89a1 100644
--- a/chrome/installer/util/language_selector.cc
+++ b/chrome/installer/util/language_selector.cc
@@ -11,6 +11,7 @@
#include <functional>
#include "base/logging.h"
+#include "base/strings/string16.h"
#include "base/strings/string_util.h"
#include "base/win/i18n.h"
#include "chrome/installer/util/google_update_settings.h"
@@ -190,7 +191,7 @@ bool MatchLanguageOffset(const std::wstring& language, int* offset) {
// configured languages.
void GetCandidatesFromSystem(std::vector<std::wstring>* candidates) {
DCHECK(candidates);
- std::wstring language;
+ base::string16 language;
// Omaha gets first pick.
GoogleUpdateSettings::GetLanguage(&language);
« no previous file with comments | « chrome/installer/util/google_update_settings_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698