diff options
| author | huangs@chromium.org <huangs@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-08 13:59:44 +0000 |
|---|---|---|
| committer | huangs@chromium.org <huangs@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-08 13:59:44 +0000 |
| commit | ecce528ba3b2b52f2467f5248903459dcfb97357 (patch) | |
| tree | 3762e251d04dd858af7a23bdc4fc0df307539379 /chrome/installer/util/language_selector.cc | |
| parent | 1e07d782b9f404edd95c70401ea650bc63225ca2 (diff) | |
| download | chromium_src-ecce528ba3b2b52f2467f5248903459dcfb97357.zip chromium_src-ecce528ba3b2b52f2467f5248903459dcfb97357.tar.gz chromium_src-ecce528ba3b2b52f2467f5248903459dcfb97357.tar.bz2 | |
Installer refactoring: using string16 instead of wstring for GoogleUpdateSettings.
BUG=297647
Review URL: https://codereview.chromium.org/371753002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@281740 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/util/language_selector.cc')
| -rw-r--r-- | chrome/installer/util/language_selector.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/installer/util/language_selector.cc b/chrome/installer/util/language_selector.cc index 0dc3f58..a58048d 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); |