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

Unified Diff: chrome/browser/chromeos/login/user_manager_impl.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/login/user_manager_impl.h ('k') | chrome/browser/chromeos/login/webui_login_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/user_manager_impl.cc
diff --git a/chrome/browser/chromeos/login/user_manager_impl.cc b/chrome/browser/chromeos/login/user_manager_impl.cc
index 5fae58b34b76f2848fa92c68261e51c464acda46..86589e176bb442b6c8394438b71d4b9b2b5ad4b7 100644
--- a/chrome/browser/chromeos/login/user_manager_impl.cc
+++ b/chrome/browser/chromeos/login/user_manager_impl.cc
@@ -635,7 +635,7 @@ User::OAuthTokenStatus UserManagerImpl::LoadUserOAuthStatus(
}
void UserManagerImpl::SaveUserDisplayName(const std::string& user_id,
- const string16& display_name) {
+ const base::string16& display_name) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
if (User* user = FindUserAndModify(user_id)) {
@@ -659,7 +659,7 @@ void UserManagerImpl::SaveUserDisplayName(const std::string& user_id,
string16 UserManagerImpl::GetUserDisplayName(
const std::string& user_id) const {
const User* user = FindUser(user_id);
- return user ? user->display_name() : string16();
+ return user ? user->display_name() : base::string16();
}
void UserManagerImpl::SaveUserDisplayEmail(const std::string& user_id,
@@ -699,7 +699,7 @@ void UserManagerImpl::UpdateUserAccountData(
SaveUserDisplayName(user_id, account_data.display_name());
if (User* user = FindUserAndModify(user_id)) {
- string16 given_name = account_data.given_name();
+ base::string16 given_name = account_data.given_name();
user->set_given_name(given_name);
if (!IsUserNonCryptohomeDataEphemeral(user_id)) {
PrefService* local_state = g_browser_process->local_state();
@@ -1046,13 +1046,13 @@ void UserManagerImpl::EnsureUsersLoaded() {
user->set_oauth_token_status(LoadUserOAuthStatus(*it));
users_.push_back(user);
- string16 display_name;
+ base::string16 display_name;
if (prefs_display_names->GetStringWithoutPathExpansion(*it,
&display_name)) {
user->set_display_name(display_name);
}
- string16 given_name;
+ base::string16 given_name;
if (prefs_given_names->GetStringWithoutPathExpansion(*it, &given_name)) {
user->set_given_name(given_name);
}
« no previous file with comments | « chrome/browser/chromeos/login/user_manager_impl.h ('k') | chrome/browser/chromeos/login/webui_login_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698