chrome/browser/ui/webui/flags_ui.cc - 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/ui/webui/flags_ui.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

« chrome/browser/chromeos/app_mode/kiosk_app_manager.cc ('K') | « chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc ('k') | chromeos/BUILD.gn » ('j') | chromeos/chromeos.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/flags_ui.cc

diff --git a/chrome/browser/ui/webui/flags_ui.cc b/chrome/browser/ui/webui/flags_ui.cc

index 943a77fcd64c099deb2b1134c8c84d255bd658c7..4827404ea339d23118bc66e0accabe088cc4727e 100644

--- a/chrome/browser/ui/webui/flags_ui.cc

+++ b/chrome/browser/ui/webui/flags_ui.cc

@@ -44,6 +44,7 @@

#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h"

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

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

+#include "chromeos/cryptohome/cryptohome_parameters.h"

#include "chromeos/dbus/dbus_thread_manager.h"

#include "chromeos/dbus/session_manager_client.h"

#include "components/pref_registry/pref_registry_syncable.h"

@@ -246,7 +247,10 @@ void FlagsDOMHandler::HandleRestartBrowser(const base::ListValue* args) {

chromeos::DBusThreadManager::Get()

->GetSessionManagerClient()

->SetFlagsForUser(

- user_manager::UserManager::Get()->GetActiveUser()->email(), flags);

+ cryptohome::Identification(user_manager::UserManager::Get()

+ ->GetActiveUser()

+ ->GetAccountId()),

+ flags);

#endif

chrome::AttemptRestart();

}

« chrome/browser/chromeos/app_mode/kiosk_app_manager.cc ('K') | « chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc ('k') | chromeos/BUILD.gn » ('j') | chromeos/chromeos.gyp » ('J')