chromeos/cryptohome/homedir_methods.h - Issue 526353002: Merge cryptohome::RetrievedKeyData with cryptohome::KeyDefinition

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.h

Issue 526353002: Merge cryptohome::RetrievedKeyData with cryptohome::KeyDefinition (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@d_2_367847_add_get_key_data_ex_to_mount_flow

Patch Set: Created 6 years, 3 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

« chromeos/cryptohome/cryptohome_parameters.cc ('K') | « chromeos/cryptohome/cryptohome_parameters.cc ('k') | chromeos/cryptohome/homedir_methods.cc » ('j') | chromeos/cryptohome/homedir_methods.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chromeos/cryptohome/homedir_methods.h

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

index e55e30b339a7fcf854c043e955c5a3ad2e8abbaf..cabfded5834b530e5f3b44ff60ac210cf728131b 100644

--- a/chromeos/cryptohome/homedir_methods.h

+++ b/chromeos/cryptohome/homedir_methods.h

@@ -6,10 +6,10 @@

#define CHROMEOS_CRYPTOHOME_HOMEDIR_METHODS_H_

#include <string>

+#include <vector>

#include "base/basictypes.h"

#include "base/callback_forward.h"

-#include "base/memory/scoped_vector.h"

#include "chromeos/chromeos_export.h"

#include "chromeos/cryptohome/cryptohome_parameters.h"

#include "chromeos/dbus/cryptohome_client.h"

@@ -27,7 +27,7 @@ class CHROMEOS_EXPORT HomedirMethods {

typedef base::Callback<void(

bool success,

MountError return_code,

- ScopedVector<RetrievedKeyData> key_data)> GetKeyDataCallback;

+ const std::vector<KeyDefinition>& key_definitions)> GetKeyDataCallback;

typedef base::Callback<

void(bool success, MountError return_code, const std::string& mount_hash)>

MountCallback;