| Index: extensions/browser/api/device_permissions_manager.cc
|
| diff --git a/extensions/browser/api/device_permissions_manager.cc b/extensions/browser/api/device_permissions_manager.cc
|
| index 696c0edeea32eadb74f18184a39b6ef36ff03d9e..0bf8db4f69675f1821b0e905ffb79be8f7d462da 100644
|
| --- a/extensions/browser/api/device_permissions_manager.cc
|
| +++ b/extensions/browser/api/device_permissions_manager.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "extensions/browser/api/device_permissions_manager.h"
|
|
|
| +#include <stddef.h>
|
| +
|
| #include <utility>
|
|
|
| #include "base/bind.h"
|
| @@ -216,7 +218,7 @@ scoped_refptr<DevicePermissionEntry> ReadDevicePermissionEntry(
|
| // If a last used time is not stored in ExtensionPrefs last_used.is_null()
|
| // will be true.
|
| std::string last_used_str;
|
| - int64 last_used_i64 = 0;
|
| + int64_t last_used_i64 = 0;
|
| base::Time last_used;
|
| if (entry->GetStringWithoutPathExpansion(kDeviceLastUsed, &last_used_str) &&
|
| base::StringToInt64(last_used_str, &last_used_i64)) {
|
| @@ -407,8 +409,8 @@ DevicePermissionsManager* DevicePermissionsManager::Get(
|
|
|
| // static
|
| base::string16 DevicePermissionsManager::GetPermissionMessage(
|
| - uint16 vendor_id,
|
| - uint16 product_id,
|
| + uint16_t vendor_id,
|
| + uint16_t product_id,
|
| const base::string16& manufacturer_string,
|
| const base::string16& product_string,
|
| const base::string16& serial_number,
|
|
|