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

Unified Diff: chrome/browser/chromeos/login/fake_supervised_user_manager.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
Index: chrome/browser/chromeos/login/fake_supervised_user_manager.cc
diff --git a/chrome/browser/chromeos/login/fake_supervised_user_manager.cc b/chrome/browser/chromeos/login/fake_supervised_user_manager.cc
index 6310d9e80b61b8040caf4a347ebe3e3b29a1cdb7..c0c2b3452ea9c47740beecfc1779081736f13ddd 100644
--- a/chrome/browser/chromeos/login/fake_supervised_user_manager.cc
+++ b/chrome/browser/chromeos/login/fake_supervised_user_manager.cc
@@ -17,7 +17,7 @@ const User* FakeSupervisedUserManager::CreateUserRecord(
const std::string& manager_id,
const std::string& local_user_id,
const std::string& sync_user_id,
- const string16& display_name) {
+ const base::string16& display_name) {
return NULL;
}
@@ -26,7 +26,7 @@ std::string FakeSupervisedUserManager::GenerateUserId() {
}
const User* FakeSupervisedUserManager::FindByDisplayName(
- const string16& display_name) const {
+ const base::string16& display_name) const {
return NULL;
}
@@ -42,7 +42,7 @@ std::string FakeSupervisedUserManager::GetUserSyncId(
string16 FakeSupervisedUserManager::GetManagerDisplayName(
const std::string& managed_user_id) const {
- return string16();
+ return base::string16();
}
std::string FakeSupervisedUserManager::GetManagerUserId(
« no previous file with comments | « chrome/browser/chromeos/login/fake_supervised_user_manager.h ('k') | chrome/browser/chromeos/login/fake_user_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698