chrome/browser/chromeos/app_mode/kiosk_app_manager.cc - 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/app_mode/kiosk_app_manager.cc

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

Index: chrome/browser/chromeos/app_mode/kiosk_app_manager.cc

diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc b/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc

index 0dd9f22d4899af80e0f9b633d8fb0c15b5a3beb8..bb339fe9a7b6015f39417022a44d6b82e3cad454 100644

--- a/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc

+++ b/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc

@@ -38,7 +38,6 @@

#include "chromeos/dbus/dbus_thread_manager.h"

#include "chromeos/settings/cros_settings_names.h"

#include "components/ownership/owner_key_util.h"

-#include "components/signin/core/account_id/account_id.h"

#include "components/user_manager/user_manager.h"

#include "content/public/browser/browser_thread.h"

#include "extensions/common/extension_urls.h"

@@ -641,9 +640,9 @@

const user_manager::User* active_user =

user_manager::UserManager::Get()->GetActiveUser();

if (active_user) {

- const AccountId active_account_id = active_user->GetAccountId();

+ std::string active_user_id = active_user->GetUserID();

for (const auto& it : old_apps) {

- if (it.second->user_id() == active_account_id.GetUserEmail()) {

+ if (it.second->user_id() == active_user_id) {

VLOG(1) << "Currently running kiosk app removed from policy, exiting";

cryptohomes_barrier_closure = BarrierClosure(

old_apps.size(), base::Bind(&chrome::AttemptUserExit));