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

Unified Diff: interface.h

Issue 2645008: Update on feedback, update dbus API, add unit tests. TEST=manual,unit,BVT BUG=3628 323 (Closed) Base URL: ssh://git@chromiumos-git/cryptohome.git
Patch Set: Address second round of feedback. Created 10 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
« no previous file with comments | « init_cryptohome_data.sh ('k') | interface.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: interface.h
diff --git a/interface.h b/interface.h
index a41172310c63de81e1c735df48dff2df2dfdf828..ade3e86c507cbf0272f57f540ac1a248c0429cba 100644
--- a/interface.h
+++ b/interface.h
@@ -4,16 +4,16 @@
#ifndef CRYPTOHOME_INTERFACE_H_
#define CRYPTOHOME_INTERFACE_H_
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-bindings.h>
-#include <glib-object.h>
#include <stdlib.h>
#include <base/logging.h>
#include <chromeos/dbus/dbus.h>
#include <chromeos/glib/object.h>
+#include <dbus/dbus-glib.h>
+#include <dbus/dbus-glib-bindings.h>
+#include <glib-object.h>
-#include "cryptohome/service.h"
+#include "service.h"
// Helpers for using GObjects until we can get a C++ wrapper going.
namespace cryptohome {
@@ -55,11 +55,17 @@ gboolean cryptohome_is_mounted(Cryptohome *self,
gboolean cryptohome_mount(Cryptohome *self,
gchar *userid,
gchar *key,
+ gint *OUT_error,
gboolean *OUT_done,
GError **error);
+gboolean cryptohome_mount_guest(Cryptohome *self,
+ gint *OUT_error,
+ gboolean *OUT_done,
+ GError **error);
gboolean cryptohome_unmount(Cryptohome *self,
gboolean *OUT_done,
GError **error);
+
} // namespace gobject
} // namespace cryptohome
#endif // CRYPTOHOME_INTERFACE_H_
« no previous file with comments | « init_cryptohome_data.sh ('k') | interface.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698