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

Unified Diff: chrome/browser/chromeos/login/language_list.h

Issue 105193002: Replace string16 with base::string16. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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/browser/chromeos/login/helper.cc ('k') | chrome/browser/chromeos/login/language_list.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/language_list.h
diff --git a/chrome/browser/chromeos/login/language_list.h b/chrome/browser/chromeos/login/language_list.h
index f959de402b8075428b8a64dc0fae28fba253727e..4edfb1132be20b737658cf292bdf62f0bc0422ba 100644
--- a/chrome/browser/chromeos/login/language_list.h
+++ b/chrome/browser/chromeos/login/language_list.h
@@ -25,7 +25,7 @@ class LanguageList {
int languages_count() const { return static_cast<int>(locale_names_.size()); }
// Returns the language for the given |index|.
- string16 GetLanguageNameAt(int index) const;
+ base::string16 GetLanguageNameAt(int index) const;
// Return the locale for the given |index|. E.g., may return pt-BR.
std::string GetLocaleFromIndex(int index) const;
@@ -40,10 +40,10 @@ class LanguageList {
private:
struct LocaleData {
LocaleData() {}
- LocaleData(const string16& name, const std::string& code)
+ LocaleData(const base::string16& name, const std::string& code)
: native_name(name), locale_code(code) {}
- string16 native_name;
+ base::string16 native_name;
std::string locale_code; // E.g., en-us.
};
« no previous file with comments | « chrome/browser/chromeos/login/helper.cc ('k') | chrome/browser/chromeos/login/language_list.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698