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

Side by Side Diff: content/browser/geolocation/wifi_data_provider_linux.h

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, 4 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef DEVICE_GEOLOCATION_WIFI_DATA_PROVIDER_LINUX_H_ 5 #ifndef CONTENT_BROWSER_GEOLOCATION_WIFI_DATA_PROVIDER_LINUX_H_
6 #define DEVICE_GEOLOCATION_WIFI_DATA_PROVIDER_LINUX_H_ 6 #define CONTENT_BROWSER_GEOLOCATION_WIFI_DATA_PROVIDER_LINUX_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "device/geolocation/geolocation_export.h" 10 #include "content/browser/geolocation/wifi_data_provider_common.h"
11 #include "device/geolocation/wifi_data_provider_common.h" 11 #include "content/common/content_export.h"
12 12
13 namespace dbus { 13 namespace dbus {
14 class Bus; 14 class Bus;
15 }; 15 };
16 16
17 namespace device { 17 namespace content {
18 18
19 class DEVICE_GEOLOCATION_EXPORT WifiDataProviderLinux 19 class CONTENT_EXPORT WifiDataProviderLinux : public WifiDataProviderCommon {
20 : public WifiDataProviderCommon {
21 public: 20 public:
22 WifiDataProviderLinux(); 21 WifiDataProviderLinux();
23 22
24 private: 23 private:
25 friend class GeolocationWifiDataProviderLinuxTest; 24 friend class GeolocationWifiDataProviderLinuxTest;
26 25
27 ~WifiDataProviderLinux() override; 26 ~WifiDataProviderLinux() override;
28 27
29 // WifiDataProviderCommon 28 // WifiDataProviderCommon
30 WlanApiInterface* NewWlanApi() override; 29 WlanApiInterface* NewWlanApi() override;
31 WifiPollingPolicy* NewPollingPolicy() override; 30 WifiPollingPolicy* NewPollingPolicy() override;
32 31
33 // For testing. 32 // For testing.
34 WlanApiInterface* NewWlanApiForTesting(dbus::Bus* bus); 33 WlanApiInterface* NewWlanApiForTesting(dbus::Bus* bus);
35 34
36 DISALLOW_COPY_AND_ASSIGN(WifiDataProviderLinux); 35 DISALLOW_COPY_AND_ASSIGN(WifiDataProviderLinux);
37 }; 36 };
38 37
39 } // namespace device 38 } // namespace content
40 39
41 #endif // DEVICE_GEOLOCATION_WIFI_DATA_PROVIDER_LINUX_H_ 40 #endif // CONTENT_BROWSER_GEOLOCATION_WIFI_DATA_PROVIDER_LINUX_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698