Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(528)

Unified Diff: chrome/browser/chromeos/app_mode/app_session.cc

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 cryptohome::Identification() . 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
Index: chrome/browser/chromeos/app_mode/app_session.cc
diff --git a/chrome/browser/chromeos/app_mode/app_session.cc b/chrome/browser/chromeos/app_mode/app_session.cc
index 850615e55d809005766f71464748ba67d888b812..6f2e374899ddf825c283f770a7792b02149e8cdf 100644
--- a/chrome/browser/chromeos/app_mode/app_session.cc
+++ b/chrome/browser/chromeos/app_mode/app_session.cc
@@ -120,8 +120,9 @@ class AppSession::AppWindowHandler : public AppWindowRegistry::Observer {
void OnAppWindowRemoved(AppWindow* app_window) override {
if (window_registry_->GetAppWindowsForApp(app_id_).empty()) {
- if (DemoAppLauncher::IsDemoAppSession(
- user_manager::UserManager::Get()->GetActiveUser()->email())) {
+ if (DemoAppLauncher::IsDemoAppSession(user_manager::UserManager::Get()
+ ->GetActiveUser()
+ ->GetAccountId())) {
// If we were in demo mode, we disabled all our network technologies,
// re-enable them.
NetworkStateHandler* handler =
@@ -188,7 +189,7 @@ void AppSession::Init(Profile* profile, const std::string& app_id) {
// For a demo app, we don't need to either setup the update service or
// the idle app name notification.
if (DemoAppLauncher::IsDemoAppSession(
- user_manager::UserManager::Get()->GetActiveUser()->email()))
+ user_manager::UserManager::Get()->GetActiveUser()->GetAccountId()))
return;
// Set the app_id for the current instance of KioskAppUpdateService.

Powered by Google App Engine
This is Rietveld 408576698