| Index: extensions/browser/api/networking_private/networking_private_linux.cc
|
| diff --git a/extensions/browser/api/networking_private/networking_private_linux.cc b/extensions/browser/api/networking_private/networking_private_linux.cc
|
| index 042b14397b4f3eb22b8d5d269303a3dfbc138d60..dd489034c133a1b0dbc990d4ef134e8a66fc5601 100644
|
| --- a/extensions/browser/api/networking_private/networking_private_linux.cc
|
| +++ b/extensions/browser/api/networking_private/networking_private_linux.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "extensions/browser/api/networking_private/networking_private_linux.h"
|
|
|
| +#include <stddef.h>
|
| +
|
| #include "base/bind.h"
|
| #include "base/bind_helpers.h"
|
| #include "base/callback.h"
|
| @@ -388,7 +390,7 @@ void NetworkingPrivateLinux::ConnectToNetwork(const std::string& guid,
|
| dbus::MessageWriter variant_writer(&method_call);
|
| wifi_dict_writer.OpenVariant("ay", &variant_writer);
|
| variant_writer.AppendArrayOfBytes(
|
| - reinterpret_cast<const uint8*>(ssid.c_str()), ssid.size());
|
| + reinterpret_cast<const uint8_t*>(ssid.c_str()), ssid.size());
|
|
|
| // Close all the arrays and dicts.
|
| wifi_dict_writer.CloseContainer(&variant_writer);
|
| @@ -692,7 +694,7 @@ NetworkingPrivateLinux::DeviceType NetworkingPrivateLinux::GetDeviceType(
|
| }
|
|
|
| dbus::MessageReader reader(response.get());
|
| - uint32 device_type = 0;
|
| + uint32_t device_type = 0;
|
| if (!reader.PopVariantOfUint32(&device_type)) {
|
| LOG(ERROR) << "Unexpected response for device " << device_type << ": "
|
| << response->ToString();
|
| @@ -773,7 +775,7 @@ bool NetworkingPrivateLinux::GetAccessPointInfo(
|
| return false;
|
| }
|
|
|
| - const uint8* ssid_bytes = NULL;
|
| + const uint8_t* ssid_bytes = NULL;
|
| size_t ssid_length = 0;
|
| if (!variant_reader.PopArrayOfBytes(&ssid_bytes, &ssid_length)) {
|
| LOG(ERROR) << "Unexpected response for " << access_point_path.value()
|
| @@ -797,7 +799,7 @@ bool NetworkingPrivateLinux::GetAccessPointInfo(
|
| }
|
|
|
| dbus::MessageReader reader(response.get());
|
| - uint8 strength = 0;
|
| + uint8_t strength = 0;
|
| if (!reader.PopVariantOfByte(&strength)) {
|
| LOG(ERROR) << "Unexpected response for " << access_point_path.value()
|
| << ": " << response->ToString();
|
| @@ -812,7 +814,7 @@ bool NetworkingPrivateLinux::GetAccessPointInfo(
|
| // which are of the same type and can be OR'd together to find all supported
|
| // security modes.
|
|
|
| - uint32 wpa_security_flags = 0;
|
| + uint32_t wpa_security_flags = 0;
|
| {
|
| scoped_ptr<dbus::Response> response(GetAccessPointProperty(
|
| access_point_proxy,
|
| @@ -830,7 +832,7 @@ bool NetworkingPrivateLinux::GetAccessPointInfo(
|
| }
|
| }
|
|
|
| - uint32 rsn_security_flags = 0;
|
| + uint32_t rsn_security_flags = 0;
|
| {
|
| scoped_ptr<dbus::Response> response(GetAccessPointProperty(
|
| access_point_proxy,
|
| @@ -961,7 +963,7 @@ void NetworkingPrivateLinux::AddOrUpdateAccessPoint(
|
| }
|
| }
|
|
|
| -void NetworkingPrivateLinux::MapSecurityFlagsToString(uint32 security_flags,
|
| +void NetworkingPrivateLinux::MapSecurityFlagsToString(uint32_t security_flags,
|
| std::string* security) {
|
| // Valid values are None, WEP-PSK, WEP-8021X, WPA-PSK, WPA-EAP
|
| if (security_flags == NetworkingPrivateLinux::NM_802_11_AP_SEC_NONE) {
|
|
|