chrome/browser/chromeos/app_mode/kiosk_app_manager.h - Issue 1693383003: ChromeOS cryptohome should be able to use gaia id as user identifier.

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.h

Issue 1693383003: ChromeOS cryptohome should be able to use gaia id as user identifier. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Add missing files. Created 4 years, 10 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

« chrome/browser/browsing_data/browsing_data_remover.cc ('K') | « chrome/browser/chromeos/app_mode/kiosk_app_data.cc ('k') | chrome/browser/chromeos/app_mode/kiosk_app_manager.cc » ('j') | chrome/browser/chromeos/app_mode/kiosk_app_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index ee80b49f0501fdd76c38f1cf9e260de38fa1e184..08d6c1e1dc51cef4f17662c9e8edb55001e4f42b 100644

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

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

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

#include "chrome/browser/chromeos/extensions/external_cache.h"

#include "chrome/browser/chromeos/policy/enterprise_install_attributes.h"

#include "chrome/browser/chromeos/settings/cros_settings.h"

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

#include "ui/gfx/image/image_skia.h"

class PrefRegistrySimple;

@@ -69,7 +70,7 @@ class KioskAppManager : public KioskAppDataDelegate,

~App();

std::string app_id;

- std::string user_id;

+ AccountId account_id;

std::string name;

gfx::ImageSkia icon;

bool is_loading;