| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 // Provides wifi scan API binding for chromeos, using proprietary APIs. | 5 // Provides wifi scan API binding for chromeos, using proprietary APIs. |
| 6 | 6 |
| 7 #include "chrome/browser/geolocation/wifi_data_provider_chromeos.h" | 7 #include "chrome/browser/geolocation/wifi_data_provider_chromeos.h" |
| 8 | 8 |
| 9 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
| 10 #include "chrome/browser/chromeos/cros/cros_library.h" |
| 10 #include "chrome/browser/chromeos/cros/network_library.h" | 11 #include "chrome/browser/chromeos/cros/network_library.h" |
| 11 | 12 |
| 12 namespace { | 13 namespace { |
| 13 // The time periods between successive polls of the wifi data. | 14 // The time periods between successive polls of the wifi data. |
| 14 const int kDefaultPollingIntervalMilliseconds = 10 * 1000; // 10s | 15 const int kDefaultPollingIntervalMilliseconds = 10 * 1000; // 10s |
| 15 const int kNoChangePollingIntervalMilliseconds = 2 * 60 * 1000; // 2 mins | 16 const int kNoChangePollingIntervalMilliseconds = 2 * 60 * 1000; // 2 mins |
| 16 const int kTwoNoChangePollingIntervalMilliseconds = 10 * 60 * 1000; // 10 mins | 17 const int kTwoNoChangePollingIntervalMilliseconds = 10 * 60 * 1000; // 10 mins |
| 17 const int kNoWifiPollingIntervalMilliseconds = 20 * 1000; // 20s | 18 const int kNoWifiPollingIntervalMilliseconds = 20 * 1000; // 20s |
| 18 } | 19 } |
| 19 | 20 |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 } | 79 } |
| 79 | 80 |
| 80 WifiDataProviderCommon::WlanApiInterface* | 81 WifiDataProviderCommon::WlanApiInterface* |
| 81 WifiDataProviderChromeOs::NewWlanApi(chromeos::NetworkLibrary* lib) { | 82 WifiDataProviderChromeOs::NewWlanApi(chromeos::NetworkLibrary* lib) { |
| 82 return new chromeos::NetworkLibraryWlanApi(lib); | 83 return new chromeos::NetworkLibraryWlanApi(lib); |
| 83 } | 84 } |
| 84 | 85 |
| 85 WifiDataProviderCommon::WlanApiInterface* | 86 WifiDataProviderCommon::WlanApiInterface* |
| 86 WifiDataProviderChromeOs::NewWlanApi() { | 87 WifiDataProviderChromeOs::NewWlanApi() { |
| 87 if (network_library_ == NULL) { | 88 if (network_library_ == NULL) { |
| 88 network_library_.reset(new chromeos::NetworkLibraryImpl()); | 89 network_library_.reset(chromeos::CrosLibrary::Get()->GetNetworkLibrary()); |
| 89 // TODO(joth): Check net_lib loaded ok, if not return NULL. | 90 // TODO(joth): Check net_lib loaded ok, if not return NULL. |
| 90 } | 91 } |
| 91 return NewWlanApi(network_library_.get()); | 92 return NewWlanApi(network_library_.get()); |
| 92 } | 93 } |
| 93 | 94 |
| 94 PollingPolicyInterface* WifiDataProviderChromeOs::NewPollingPolicy() { | 95 PollingPolicyInterface* WifiDataProviderChromeOs::NewPollingPolicy() { |
| 95 return new GenericPollingPolicy<kDefaultPollingIntervalMilliseconds, | 96 return new GenericPollingPolicy<kDefaultPollingIntervalMilliseconds, |
| 96 kNoChangePollingIntervalMilliseconds, | 97 kNoChangePollingIntervalMilliseconds, |
| 97 kTwoNoChangePollingIntervalMilliseconds, | 98 kTwoNoChangePollingIntervalMilliseconds, |
| 98 kNoWifiPollingIntervalMilliseconds>; | 99 kNoWifiPollingIntervalMilliseconds>; |
| 99 } | 100 } |
| OLD | NEW |