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

Unified Diff: chrome/browser/chromeos/login/user.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/user.h
diff --git a/chrome/browser/chromeos/login/user.h b/chrome/browser/chromeos/login/user.h
index 708b1f39cb17d4e75c32d0214452632fe0d61d43..5c8168a8458f664015e0f16203d1f3cfc06b228c 100644
--- a/chrome/browser/chromeos/login/user.h
+++ b/chrome/browser/chromeos/login/user.h
@@ -106,10 +106,10 @@ class User {
const std::string& email() const { return email_; }
// Returns the human name to display for this user.
- string16 GetDisplayName() const;
+ base::string16 GetDisplayName() const;
// Returns given name of user, or empty string if given name is unknown.
- const string16& given_name() const { return given_name_; }
+ const base::string16& given_name() const { return given_name_; }
// Returns the account name part of the email. Use the display form of the
// email if available and use_display_name == true. Otherwise use canonical.
@@ -154,7 +154,7 @@ class User {
OAuthTokenStatus oauth_token_status() const { return oauth_token_status_; }
// The displayed user name.
- string16 display_name() const { return display_name_; }
+ base::string16 display_name() const { return display_name_; }
// The displayed (non-canonical) user email.
virtual std::string display_email() const;
@@ -214,11 +214,11 @@ class User {
oauth_token_status_ = status;
}
- void set_display_name(const string16& display_name) {
+ void set_display_name(const base::string16& display_name) {
display_name_ = display_name;
}
- void set_given_name(const string16& given_name) { given_name_ = given_name; }
+ void set_given_name(const base::string16& given_name) { given_name_ = given_name; }
void set_display_email(const std::string& display_email) {
display_email_ = display_email;
@@ -247,8 +247,8 @@ class User {
private:
std::string email_;
- string16 display_name_;
- string16 given_name_;
+ base::string16 display_name_;
+ base::string16 given_name_;
// The displayed user email, defaults to |email_|.
std::string display_email_;
UserImage user_image_;
« no previous file with comments | « chrome/browser/chromeos/login/supervised_user_manager_impl.cc ('k') | chrome/browser/chromeos/login/user.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698