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

Side by Side Diff: chromeos/cryptohome/cryptohome_parameters.cc

Issue 2529103002: Add account_type into AccountId (Closed)
Patch Set: Created 4 years 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chromeos/cryptohome/cryptohome_parameters.h" 5 #include "chromeos/cryptohome/cryptohome_parameters.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include "chromeos/dbus/cryptohome/key.pb.h" 10 #include "chromeos/dbus/cryptohome/key.pb.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 return known_id; 60 return known_id;
61 } 61 }
62 } 62 }
63 63
64 for (const AccountId& known_id : known_account_ids) { 64 for (const AccountId& known_id : known_account_ids) {
65 if (known_id.GetUserEmail() == id_) { 65 if (known_id.GetUserEmail() == id_) {
66 return known_id; 66 return known_id;
67 } 67 }
68 } 68 }
69 69
70 return user_manager::known_user::GetAccountId(id_, 70 return user_manager::known_user::GetAccountId(
71 std::string() /* gaia_id */); 71 id_, std::string() /* gaia_id */, std::string() /* account_type */);
72 } 72 }
73 73
74 KeyDefinition::AuthorizationData::Secret::Secret() : encrypt(false), 74 KeyDefinition::AuthorizationData::Secret::Secret() : encrypt(false),
75 sign(false), 75 sign(false),
76 wrapped(false) { 76 wrapped(false) {
77 } 77 }
78 78
79 KeyDefinition::AuthorizationData::Secret::Secret( 79 KeyDefinition::AuthorizationData::Secret::Secret(
80 bool encrypt, 80 bool encrypt,
81 bool sign, 81 bool sign,
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 } // namespace cryptohome 255 } // namespace cryptohome
256 256
257 namespace BASE_HASH_NAMESPACE { 257 namespace BASE_HASH_NAMESPACE {
258 258
259 std::size_t hash<cryptohome::Identification>::operator()( 259 std::size_t hash<cryptohome::Identification>::operator()(
260 const cryptohome::Identification& cryptohome_id) const { 260 const cryptohome::Identification& cryptohome_id) const {
261 return hash<std::string>()(cryptohome_id.id()); 261 return hash<std::string>()(cryptohome_id.id());
262 } 262 }
263 263
264 } // namespace BASE_HASH_NAMESPACE 264 } // namespace BASE_HASH_NAMESPACE
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698