chrome/browser/extensions/extension_assets_manager_chromeos.cc - Issue 1412813003: 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/extensions/extension_assets_manager_chromeos.cc

Issue 1412813003: 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: Fix Win GN build. 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/extensions/crx_installer_browsertest.cc ('k') | chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_assets_manager_chromeos.cc

diff --git a/chrome/browser/extensions/extension_assets_manager_chromeos.cc b/chrome/browser/extensions/extension_assets_manager_chromeos.cc

index 8fc3425688318461dda6ab319a52a31cd002235e..5498941db9e60ee3528cff204a0ce0f9fef28783 100644

--- a/chrome/browser/extensions/extension_assets_manager_chromeos.cc

+++ b/chrome/browser/extensions/extension_assets_manager_chromeos.cc

@@ -287,7 +287,8 @@ void ExtensionAssetsManagerChromeOS::CheckSharedExtension(

return;

}

- if (user_manager->IsUserNonCryptohomeDataEphemeral(user_id) ||

+ if (user_manager->IsUserNonCryptohomeDataEphemeral(

+ AccountId::FromUserEmail(user_id)) ||

!user_manager->IsLoggedInAsUserWithGaiaAccount()) {

// Don't cache anything in shared location for ephemeral user or special

// user types.

@@ -530,7 +531,8 @@ bool ExtensionAssetsManagerChromeOS::CleanUpExtension(

NOTREACHED();

return false;

}

- const user_manager::User* user = user_manager->FindUser(user_id);

+ const user_manager::User* user =

+ user_manager->FindUser(AccountId::FromUserEmail(user_id));

bool not_used = false;

if (!user) {

not_used = true;