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

Unified Diff: chrome/browser/chromeos/login/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
« no previous file with comments | « chrome/browser/chromeos/login/user.cc ('k') | chrome/browser/chromeos/login/user_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/user_manager.h
diff --git a/chrome/browser/chromeos/login/user_manager.h b/chrome/browser/chromeos/login/user_manager.h
index 43ba630e9a5d46c4b4ef6a47a9ced035bc5fc6b2..05bec86e7e6719511c0332f6c40fe648a0ab1ef4 100644
--- a/chrome/browser/chromeos/login/user_manager.h
+++ b/chrome/browser/chromeos/login/user_manager.h
@@ -59,17 +59,17 @@ class UserManager {
// Data retrieved from user account.
class UserAccountData {
public:
- UserAccountData(const string16& display_name,
- const string16& given_name,
+ UserAccountData(const base::string16& display_name,
+ const base::string16& given_name,
const std::string& locale);
~UserAccountData();
- const string16& display_name() const { return display_name_; }
- const string16& given_name() const { return given_name_; }
+ const base::string16& display_name() const { return display_name_; }
+ const base::string16& given_name() const { return given_name_; }
const std::string& locale() const { return locale_; }
private:
- const string16 display_name_;
- const string16 given_name_;
+ const base::string16 display_name_;
+ const base::string16 given_name_;
const std::string locale_;
DISALLOW_COPY_AND_ASSIGN(UserAccountData);
@@ -228,7 +228,7 @@ class UserManager {
// Saves user's displayed name in local state preferences.
// Ignored If there is no such user.
virtual void SaveUserDisplayName(const std::string& user_id,
- const string16& display_name) = 0;
+ const base::string16& display_name) = 0;
// Updates data upon User Account download.
virtual void UpdateUserAccountData(const std::string& user_id,
@@ -237,7 +237,7 @@ class UserManager {
// Returns the display name for user |user_id| if it is known (was
// previously set by a |SaveUserDisplayName| call).
// Otherwise, returns an empty string.
- virtual string16 GetUserDisplayName(
+ virtual base::string16 GetUserDisplayName(
const std::string& user_id) const = 0;
// Saves user's displayed (non-canonical) email in local state preferences.
« no previous file with comments | « chrome/browser/chromeos/login/user.cc ('k') | chrome/browser/chromeos/login/user_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698