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

Unified Diff: chrome/browser/chromeos/locale_change_guard.cc

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/locale_change_guard.h ('k') | chrome/browser/chromeos/login/captive_portal_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/locale_change_guard.cc
diff --git a/chrome/browser/chromeos/locale_change_guard.cc b/chrome/browser/chromeos/locale_change_guard.cc
index 46ff6366a1fa35db99c52eb52de5f38a57b47880..acd34839cbf229350be0d06a65eaf4af7b1b6c09 100644
--- a/chrome/browser/chromeos/locale_change_guard.cc
+++ b/chrome/browser/chromeos/locale_change_guard.cc
@@ -219,9 +219,9 @@ void LocaleChangeGuard::PrepareChangingLocale(
to_locale_ = to_locale;
if (!from_locale_.empty() && !to_locale_.empty()) {
- string16 from = l10n_util::GetDisplayNameForLocale(
+ base::string16 from = l10n_util::GetDisplayNameForLocale(
from_locale_, cur_locale, true);
- string16 to = l10n_util::GetDisplayNameForLocale(
+ base::string16 to = l10n_util::GetDisplayNameForLocale(
to_locale_, cur_locale, true);
title_text_ = l10n_util::GetStringUTF16(
« no previous file with comments | « chrome/browser/chromeos/locale_change_guard.h ('k') | chrome/browser/chromeos/login/captive_portal_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698