| 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.
|
| };
|
|
|
|
|