chrome/browser/chromeos/login/fake_supervised_user_manager.h - Issue 105193002: Replace string16 with base::string16.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/login/fake_supervised_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:

Index: chrome/browser/chromeos/login/fake_supervised_user_manager.h

diff --git a/chrome/browser/chromeos/login/fake_supervised_user_manager.h b/chrome/browser/chromeos/login/fake_supervised_user_manager.h

index a291ade8df58d56f66645a3eba5177834d77ecc8..d68ead154521048633fb8d07d0863722a575efbb 100644

--- a/chrome/browser/chromeos/login/fake_supervised_user_manager.h

+++ b/chrome/browser/chromeos/login/fake_supervised_user_manager.h

@@ -21,19 +21,19 @@ class FakeSupervisedUserManager : public SupervisedUserManager {

const std::string& manager_id,

const std::string& local_user_id,

const std::string& sync_user_id,

- const string16& display_name) OVERRIDE;

+ const base::string16& display_name) OVERRIDE;

virtual std::string GenerateUserId() OVERRIDE;

- virtual const User* FindByDisplayName(const string16& display_name) const

+ virtual const User* FindByDisplayName(const base::string16& display_name) const

OVERRIDE;

virtual const User* FindBySyncId(const std::string& sync_id) const OVERRIDE;

virtual std::string GetUserSyncId(const std::string& user_id) const OVERRIDE;

- virtual string16 GetManagerDisplayName(const std::string& user_id) const

+ virtual base::string16 GetManagerDisplayName(const std::string& user_id) const

OVERRIDE;

virtual std::string GetManagerUserId(const std::string& user_id) const

OVERRIDE;

virtual std::string GetManagerDisplayEmail(const std::string& user_id) const

OVERRIDE;

- virtual void StartCreationTransaction(const string16& display_name)

+ virtual void StartCreationTransaction(const base::string16& display_name)

OVERRIDE {}

virtual void SetCreationTransactionUserId(const std::string& user_id)

OVERRIDE {}