chrome/browser/ui/ash/session_state_delegate_chromeos.h - Issue 1428213004: This CL replaces std::string user_id in ash/* 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/ui/ash/session_state_delegate_chromeos.h

Issue 1428213004: This CL replaces std::string user_id in ash/* with AccountId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Update after review. Created 5 years, 1 month 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/ui/ash/multi_user/user_switch_animator_chromeos.cc ('k') | chrome/browser/ui/ash/session_state_delegate_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/session_state_delegate_chromeos.h

diff --git a/chrome/browser/ui/ash/session_state_delegate_chromeos.h b/chrome/browser/ui/ash/session_state_delegate_chromeos.h

index bbdf6b22e2a8870a75db650fc3ca3255b9f5fe05..04ce9a48fb3935a1560db160f4129233189e447a 100644

--- a/chrome/browser/ui/ash/session_state_delegate_chromeos.h

+++ b/chrome/browser/ui/ash/session_state_delegate_chromeos.h

@@ -42,7 +42,7 @@ class SessionStateDelegateChromeos

ash::UserIndex index) const override;

bool ShouldShowAvatar(aura::Window* window) const override;

gfx::ImageSkia GetAvatarImageForWindow(aura::Window* window) const override;

- void SwitchActiveUser(const std::string& user_id) override;

+ void SwitchActiveUser(const AccountId& account_id) override;

void CycleActiveUser(CycleUser cycle_user) override;

bool IsMultiProfileAllowedByPrimaryUserPolicy() const override;

void AddSessionStateObserver(ash::SessionStateObserver* observer) override;

@@ -70,7 +70,7 @@ class SessionStateDelegateChromeos

// Switches to a new user. This call might show a dialog asking the user if he

// wants to stop desktop casting before switching.

- void TryToSwitchUser(const std::string& user_id);

+ void TryToSwitchUser(const AccountId& account_id);

// List of observers is only used on Chrome OS for now.

base::ObserverList<ash::SessionStateObserver> session_state_observer_list_;