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

Unified Diff: chromeos/cryptohome/cryptohome_parameters.cc

Issue 506943002: Wire up GetKeyDataEx() in Chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@d_1_367847_move_to_mount_ex
Patch Set: Created 6 years, 4 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: chromeos/cryptohome/cryptohome_parameters.cc
diff --git a/chromeos/cryptohome/cryptohome_parameters.cc b/chromeos/cryptohome/cryptohome_parameters.cc
index eb6d906b68089ef73daa988acc0ad453a53b6dbf..cd96d2b7f5507f16de30c273e31ac9c156fd4a89 100644
--- a/chromeos/cryptohome/cryptohome_parameters.cc
+++ b/chromeos/cryptohome/cryptohome_parameters.cc
@@ -4,8 +4,9 @@
#include "chromeos/cryptohome/cryptohome_parameters.h"
-namespace cryptohome {
+#include "chromeos/dbus/cryptohome/key.pb.h"
+namespace cryptohome {
Identification::Identification(const std::string& user_id) : user_id(user_id) {
}
@@ -49,14 +50,26 @@ bool Authorization::operator==(const Authorization& other) const {
return key == other.key && label == other.label;
}
-MountParameters::MountParameters(bool ephemeral) : ephemeral(ephemeral) {
+RetrievedKeyData::ProviderData::ProviderData(const std::string& name)
+ : name(name) {
}
-MountParameters::~MountParameters() {
+RetrievedKeyData::RetrievedKeyData(Type type,
+ const std::string& label,
+ int64 revision) : type(type),
+ label(label),
+ privileges(0),
+ revision(revision) {
+}
+
+MountParameters::MountParameters(bool ephemeral) : ephemeral(ephemeral) {
}
bool MountParameters::operator==(const MountParameters& other) const {
return ephemeral == other.ephemeral && create_keys == other.create_keys;
}
+MountParameters::~MountParameters() {
+}
+
} // namespace cryptohome

Powered by Google App Engine
This is Rietveld 408576698