content/browser/geolocation/wifi_data_provider_corewlan_mac.mm - Issue 1549113002: Switch to standard integer types in content/browser/.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/geolocation/wifi_data_provider_corewlan_mac.mm

Issue 1549113002: Switch to standard integer types in content/browser/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 5 years 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 | « content/browser/geolocation/wifi_data_provider_common_win.cc ('k') | content/browser/geolocation/wifi_data_provider_linux.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/geolocation/wifi_data_provider_corewlan_mac.mm

diff --git a/content/browser/geolocation/wifi_data_provider_corewlan_mac.mm b/content/browser/geolocation/wifi_data_provider_corewlan_mac.mm

index 7e783f42942d1a6ed43768d8f7db123368490a25..011b4141c1c06cdcc53ddddda6e932d8d667f414 100644

--- a/content/browser/geolocation/wifi_data_provider_corewlan_mac.mm

+++ b/content/browser/geolocation/wifi_data_provider_corewlan_mac.mm

@@ -8,9 +8,11 @@

#include <dlfcn.h>

#import <Foundation/Foundation.h>

+#include <stdint.h>

#include "base/mac/scoped_nsautorelease_pool.h"

#include "base/mac/scoped_nsobject.h"

+#include "base/macros.h"

#include "base/metrics/histogram.h"

#include "base/strings/sys_string_conversions.h"

@@ -152,8 +154,8 @@ bool CoreWlanApi::GetAccessPointData(WifiData::AccessPointDataSet* data) {

AccessPointData access_point_data;

NSData* mac = [network bssidData];

DCHECK([mac length] == 6);

- access_point_data.mac_address = MacAddressAsString16(

- static_cast<const uint8*>([mac bytes]));

+ access_point_data.mac_address =

+ MacAddressAsString16(static_cast<const uint8_t*>([mac bytes]));

access_point_data.radio_signal_strength = [[network rssi] intValue];

access_point_data.channel = [[network channel] intValue];

access_point_data.signal_to_noise =