| Index: chromeos/cryptohome/cryptohome_parameters.h
|
| diff --git a/chromeos/cryptohome/cryptohome_parameters.h b/chromeos/cryptohome/cryptohome_parameters.h
|
| index 0b744a42416b2c49a98e05c5e3c08f177eb86f22..3738b56bce8870607b828197b32cfd6552119f30 100644
|
| --- a/chromeos/cryptohome/cryptohome_parameters.h
|
| +++ b/chromeos/cryptohome/cryptohome_parameters.h
|
| @@ -5,10 +5,11 @@
|
| #ifndef CHROMEOS_CRYPTOHOME_CRYPTOHOME_PARAMETERS_H_
|
| #define CHROMEOS_CRYPTOHOME_CRYPTOHOME_PARAMETERS_H_
|
|
|
| +#include <stdint.h>
|
| +
|
| #include <string>
|
| #include <vector>
|
|
|
| -#include "base/basictypes.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "chromeos/chromeos_export.h"
|
|
|
| @@ -85,7 +86,7 @@ struct CHROMEOS_EXPORT KeyDefinition {
|
| ProviderData();
|
| explicit ProviderData(const std::string& name);
|
| explicit ProviderData(const ProviderData& other);
|
| - ProviderData(const std::string& name, int64 number);
|
| + ProviderData(const std::string& name, int64_t number);
|
| ProviderData(const std::string& name, const std::string& bytes);
|
| void operator=(const ProviderData& other);
|
| ~ProviderData();
|
| @@ -93,7 +94,7 @@ struct CHROMEOS_EXPORT KeyDefinition {
|
| bool operator==(const ProviderData& other) const;
|
|
|
| std::string name;
|
| - scoped_ptr<int64> number;
|
| + scoped_ptr<int64_t> number;
|
| scoped_ptr<std::string> bytes;
|
| };
|
|
|
|
|