Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(179)

Unified Diff: content/browser/geolocation/wifi_data_provider_win.cc

Issue 2192683003: Revert of Reland: Geolocation: move from content/browser to device/ (patchset #2 id:20001 of https:… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2810
Patch Set: Created 4 years, 5 months 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
Index: content/browser/geolocation/wifi_data_provider_win.cc
diff --git a/device/geolocation/wifi_data_provider_win.cc b/content/browser/geolocation/wifi_data_provider_win.cc
similarity index 98%
copy from device/geolocation/wifi_data_provider_win.cc
copy to content/browser/geolocation/wifi_data_provider_win.cc
index 58e622ff7103b57d42eaaa91eabf961ebfbbd560..c5eca3d6f20298508351650a8c204bec0f14c337 100644
--- a/device/geolocation/wifi_data_provider_win.cc
+++ b/content/browser/geolocation/wifi_data_provider_win.cc
@@ -21,7 +21,7 @@
// not to work on XP SP3. So we use WLAN on Vista, and use NDIS directly
// otherwise.
-#include "device/geolocation/wifi_data_provider_win.h"
+#include "content/browser/geolocation/wifi_data_provider_win.h"
#include <windows.h>
#include <winioctl.h>
@@ -31,15 +31,15 @@
#include "base/metrics/histogram.h"
#include "base/strings/utf_string_conversions.h"
#include "base/win/windows_version.h"
-#include "device/geolocation/wifi_data_provider_common.h"
-#include "device/geolocation/wifi_data_provider_common_win.h"
-#include "device/geolocation/wifi_data_provider_manager.h"
+#include "content/browser/geolocation/wifi_data_provider_common.h"
+#include "content/browser/geolocation/wifi_data_provider_common_win.h"
+#include "content/browser/geolocation/wifi_data_provider_manager.h"
// Taken from ndis.h for WinCE.
#define NDIS_STATUS_INVALID_LENGTH ((NDIS_STATUS)0xC0010014L)
#define NDIS_STATUS_BUFFER_TOO_SHORT ((NDIS_STATUS)0xC0010016L)
-namespace device {
+namespace content {
namespace {
// The limits on the size of the buffer used for the OID query.
const int kInitialBufferSize = 2 << 12; // Good for about 50 APs.
@@ -640,4 +640,4 @@ bool GetSystemDirectory(base::string16* path) {
}
} // namespace
-} // namespace device
+} // namespace content
« no previous file with comments | « content/browser/geolocation/wifi_data_provider_win.h ('k') | content/browser/geolocation/wifi_data_provider_win_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698