chrome/browser/chromeos/login/managed/locally_managed_user_creation_controller.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/managed/locally_managed_user_creation_controller.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/login_web_dialog.cc ('k') | chrome/browser/chromeos/login/managed/locally_managed_user_creation_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/managed/locally_managed_user_creation_controller.h

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

index ce509592355f0fc5850511020e6ffb4971ae0b61..c0a796bb02739d1747aad037a1460777ba5680ca 100644

--- a/chrome/browser/chromeos/login/managed/locally_managed_user_creation_controller.h

+++ b/chrome/browser/chromeos/login/managed/locally_managed_user_creation_controller.h

@@ -73,14 +73,14 @@ class LocallyManagedUserCreationController

// Set up controller for creating new supervised user with |display_name|,

// |password| and avatar indexed by |avatar_index|. StartCreation() have to

// be called to actually start creating user.

- void SetUpCreation(const string16& display_name,

+ void SetUpCreation(const base::string16& display_name,

const std::string& password,

int avatar_index);

// Configures and initiates importing existing supervised user to this device.

// Existing user is identified by |sync_id|, has |display_name|, |password|,

// |avatar_index|. The master key for cryptohome is a |master_key|.

- void StartImport(const string16& display_name,

+ void StartImport(const base::string16& display_name,

const std::string& password,

int avatar_index,

const std::string& sync_id,

@@ -103,7 +103,7 @@ class LocallyManagedUserCreationController

UserCreationContext();

~UserCreationContext();

- string16 display_name;

+ base::string16 display_name;

int avatar_index;

std::string manager_id;

std::string local_user_id; // Used to identify cryptohome.