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

Unified Diff: chrome/browser/chromeos/login/fake_user_manager.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
Index: chrome/browser/chromeos/login/fake_user_manager.h
diff --git a/chrome/browser/chromeos/login/fake_user_manager.h b/chrome/browser/chromeos/login/fake_user_manager.h
index 1bc34c646e4606e4d59c8355910174e41d45f21e..4e5d0eaec69e13bd31dce6fb742cd8443b33349e 100644
--- a/chrome/browser/chromeos/login/fake_user_manager.h
+++ b/chrome/browser/chromeos/login/fake_user_manager.h
@@ -47,7 +47,7 @@ class FakeUserManager : public UserManager {
virtual User* GetActiveUser() OVERRIDE;
virtual void SwitchActiveUser(const std::string& email) OVERRIDE;
virtual void SaveUserDisplayName(const std::string& username,
- const string16& display_name) OVERRIDE;
+ const base::string16& display_name) OVERRIDE;
// Not implemented.
virtual void UpdateUserAccountData(
@@ -75,7 +75,7 @@ class FakeUserManager : public UserManager {
virtual void SaveUserOAuthStatus(
const std::string& username,
User::OAuthTokenStatus oauth_token_status) OVERRIDE {}
- virtual string16 GetUserDisplayName(
+ virtual base::string16 GetUserDisplayName(
const std::string& username) const OVERRIDE;
virtual void SaveUserDisplayEmail(const std::string& username,
const std::string& display_email) OVERRIDE {}
« no previous file with comments | « chrome/browser/chromeos/login/fake_supervised_user_manager.cc ('k') | chrome/browser/chromeos/login/fake_user_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698