chrome/browser/chromeos/login/session/user_session_manager.h - Issue 1425093004: Revert of This CL replaces user_manager::UserID with AccountId.

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/session/user_session_manager.h

Issue 1425093004: Revert of This CL replaces user_manager::UserID with AccountId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@468875--Chrome-OS-handles-deletion-of-Gmail-account-poorly--Create-AccountID-structure-part2--user_names

Patch Set: Created 5 years, 2 months 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/screens/user_selection_screen.cc ('k') | chrome/browser/chromeos/login/session/user_session_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/session/user_session_manager.h

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

index 755132cd1eb6b7b2f2852c93dc30c558c600ff1a..dee2273dc6aeb43664101d8e7e5f75b17a3e8abb 100644

--- a/chrome/browser/chromeos/login/session/user_session_manager.h

+++ b/chrome/browser/chromeos/login/session/user_session_manager.h

@@ -24,7 +24,6 @@

#include "net/base/network_change_notifier.h"

#include "ui/base/ime/chromeos/input_method_manager.h"

-class AccountId;

class GURL;

class PrefRegistrySimple;

class PrefService;

@@ -301,7 +300,7 @@

// Profile is created, extensions and promo resources are initialized.

void UserProfileInitialized(Profile* profile,

bool is_incognito_profile,

- const AccountId& account_id);

+ const std::string& user_id);

// Callback to resume profile creation after transferring auth data from

// the authentication profile.

@@ -369,7 +368,7 @@

const locale_util::LanguageSwitchResult& result);

// Callback invoked when |token_handle_util_| has finished.

- void OnTokenHandleObtained(const AccountId& account_id, bool success);

+ void OnTokenHandleObtained(const user_manager::UserID& id, bool success);

// Returns |true| if token handles should be used on this device.

bool TokenHandlesEnabled();