Chromium Code Reviews| Index: service.h |
| diff --git a/service.h b/service.h |
| index 5dce3757c780f206e956983ce5dd185afc951fad..201ef0b4a3cb2519d77997effc81cbcb47c1a207 100644 |
| --- a/service.h |
| +++ b/service.h |
| @@ -15,6 +15,7 @@ |
| #include <glib-object.h> |
| #include "cryptohome_event_source.h" |
| +#include "install_attributes.h" |
| #include "mount.h" |
| #include "mount_task.h" |
| #include "pkcs11_init.h" |
| @@ -43,6 +44,7 @@ class Service : public chromeos::dbus::AbstractDbusService, |
| // Setup the wrapped GObject and the GMainLoop |
| virtual bool Initialize(); |
| virtual bool SeedUrandom(); |
| + virtual void InitializeInstallAttributes(bool first_time); |
| virtual bool Reset(); |
| // Used internally during registration to set the |
| @@ -71,6 +73,9 @@ class Service : public chromeos::dbus::AbstractDbusService, |
| virtual void set_auto_cleanup_period(int value) { |
| auto_cleanup_period_ = value; |
| } |
| + virtual void set_install_attrs(InstallAttributes* install_attrs) { |
| + install_attrs_ = install_attrs; |
| + } |
| virtual void set_update_user_activity_period(int value) { |
| update_user_activity_period_ = value; |
| } |
| @@ -160,6 +165,27 @@ class Service : public chromeos::dbus::AbstractDbusService, |
| virtual gboolean Pkcs11IsTpmTokenReady(gboolean* OUT_ready, GError** error); |
| virtual gboolean GetStatusString(gchar** OUT_status, GError** error); |
| + // InstallAttributes methods |
| + virtual gboolean InstallAttributesGet(gchar* name, |
| + GArray** OUT_value, |
| + gboolean* OUT_successful, |
| + GError** error); |
| + virtual gboolean InstallAttributesSet(gchar* name, |
| + GArray* value, |
| + gboolean* OUT_successful, |
| + GError** error); |
| + virtual gboolean InstallAttributesFinalize(gboolean* OUT_finalized, |
| + GError** error); |
| + virtual gboolean InstallAttributesCount(gint* OUT_count, GError** error); |
| + virtual gboolean InstallAttributesIsReady(gboolean* OUT_ready, |
| + GError** error); |
| + virtual gboolean InstallAttributesIsSecure(gboolean* OUT_secure, |
| + GError** error); |
| + virtual gboolean InstallAttributesIsInvalid(gboolean* OUT_invalid, |
| + GError** error); |
| + virtual gboolean InstallAttributesIsFirstInstall(gboolean* OUT_first_install, |
| + GError** error); |
| + |
| protected: |
| virtual GMainLoop *main_loop() { return loop_; } |
| @@ -184,6 +210,8 @@ class Service : public chromeos::dbus::AbstractDbusService, |
| guint tpm_init_signal_; |
| CryptohomeEventSource event_source_; |
| int auto_cleanup_period_; |
| + scoped_ptr<cryptohome::InstallAttributes> default_install_attrs_; |
| + cryptohome::InstallAttributes *install_attrs_; |
|
gauravsh
2011/04/14 07:39:52
nit: * next to type
Will Drewry
2011/04/15 01:31:49
Done, and fixed up all the other ones.
|
| int update_user_activity_period_; |
| DISALLOW_COPY_AND_ASSIGN(Service); |