chromeos/cryptohome/homedir_methods.cc - Issue 1165323004: We should use UserID object to identify users instead of username.

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: chromeos/cryptohome/homedir_methods.cc

Issue 1165323004: We should use UserID object to identify users instead of username. Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 6 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/profiles/profile_window.cc ('K') | « chromeos/cryptohome/cryptohome_parameters.cc ('k') | chromeos/cryptohome/mock_async_method_caller.h » ('j') | components/user_manager/user_id.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chromeos/cryptohome/homedir_methods.cc

diff --git a/chromeos/cryptohome/homedir_methods.cc b/chromeos/cryptohome/homedir_methods.cc

index aa3a29e7cf3e80afa9f36c38ea75962be8c2117e..a1bba213d506433e10d6c451f36a60ae7ebc2956 100644

--- a/chromeos/cryptohome/homedir_methods.cc

+++ b/chromeos/cryptohome/homedir_methods.cc

@@ -9,6 +9,7 @@

#include "chromeos/dbus/cryptohome/key.pb.h"

#include "chromeos/dbus/cryptohome/rpc.pb.h"

#include "chromeos/dbus/dbus_thread_manager.h"

+#include "google_apis/gaia/gaia_auth_util.h"

#if defined(USE_SYSTEM_PROTOBUF)

#include <google/protobuf/repeated_field.h>

@@ -93,7 +94,7 @@ void FillKeyProtobuf(const KeyDefinition& key_def, Key* key) {

// Fill identification protobuffer.

void FillIdentificationProtobuf(const Identification& id,

cryptohome::AccountIdentifier* id_proto) {

- id_proto->set_email(id.user_id);

+ id_proto->set_email(gaia::CanonicalizeEmail(id.user_id.GetUserEmail()));

}

// Fill authorization protobuffer.