chrome/browser/chromeos/login/users/chrome_user_manager_impl.h - Issue 1262883003: Revert of Added affiliation IDs for the new affiliation determination.

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/users/chrome_user_manager_impl.h

Issue 1262883003: Revert of Added affiliation IDs for the new affiliation determination. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

Index: chrome/browser/chromeos/login/users/chrome_user_manager_impl.h

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

index f23dee7340f790171d10d9a1a8372629f8667262..d7794917173bb3986d9a97dd90304bf1bd562d52 100644

--- a/chrome/browser/chromeos/login/users/chrome_user_manager_impl.h

+++ b/chrome/browser/chromeos/login/users/chrome_user_manager_impl.h

@@ -19,7 +19,6 @@

#include "base/time/time.h"

#include "chrome/browser/chromeos/login/easy_unlock/bootstrap_manager.h"

#include "chrome/browser/chromeos/login/user_flow.h"

-#include "chrome/browser/chromeos/login/users/affiliation.h"

#include "chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.h"

#include "chrome/browser/chromeos/login/users/chrome_user_manager.h"

#include "chrome/browser/chromeos/login/users/multi_profile_user_controller_delegate.h"

@@ -115,11 +114,6 @@

// UserManagerBase implementation:

bool AreEphemeralUsersEnabled() const override;

- // ChromeUserManager implementation:

- void SetUserAffiliation(

- const std::string& user_email,

- const AffiliationIDSet& user_affiliation_ids) override;

protected:

const std::string& GetApplicationLocale() const override;