| 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 #include "content/browser/geolocation/wifi_data_provider_common.h" | 5 #include "content/browser/geolocation/wifi_data_provider_common.h" |
| 6 | 6 |
| 7 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
| 8 | 8 |
| 9 string16 MacAddressAsString16(const uint8 mac_as_int[6]) { | 9 string16 MacAddressAsString16(const uint8 mac_as_int[6]) { |
| 10 // mac_as_int is big-endian. Write in byte chunks. | 10 // mac_as_int is big-endian. Write in byte chunks. |
| (...skipping 21 matching lines...) Expand all Loading... |
| 32 DCHECK(CalledOnClientThread()); | 32 DCHECK(CalledOnClientThread()); |
| 33 DCHECK(!IsRunning()); // StartDataProvider must only be called once. | 33 DCHECK(!IsRunning()); // StartDataProvider must only be called once. |
| 34 return Start(); | 34 return Start(); |
| 35 } | 35 } |
| 36 | 36 |
| 37 void WifiDataProviderCommon::StopDataProvider() { | 37 void WifiDataProviderCommon::StopDataProvider() { |
| 38 DCHECK(CalledOnClientThread()); | 38 DCHECK(CalledOnClientThread()); |
| 39 Stop(); | 39 Stop(); |
| 40 } | 40 } |
| 41 | 41 |
| 42 bool WifiDataProviderCommon::GetData(WifiData *data) { | 42 bool WifiDataProviderCommon::GetData(WifiData* data) { |
| 43 DCHECK(CalledOnClientThread()); | 43 DCHECK(CalledOnClientThread()); |
| 44 DCHECK(data); | 44 DCHECK(data); |
| 45 base::AutoLock lock(data_mutex_); | 45 base::AutoLock lock(data_mutex_); |
| 46 *data = wifi_data_; | 46 *data = wifi_data_; |
| 47 // If we've successfully completed a scan, indicate that we have all of the | 47 // If we've successfully completed a scan, indicate that we have all of the |
| 48 // data we can get. | 48 // data we can get. |
| 49 return is_first_scan_complete_; | 49 return is_first_scan_complete_; |
| 50 } | 50 } |
| 51 | 51 |
| 52 // Thread implementation | 52 // Thread implementation |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 NotifyListeners(); | 93 NotifyListeners(); |
| 94 } | 94 } |
| 95 } | 95 } |
| 96 | 96 |
| 97 void WifiDataProviderCommon::ScheduleNextScan(int interval) { | 97 void WifiDataProviderCommon::ScheduleNextScan(int interval) { |
| 98 message_loop()->PostDelayedTask( | 98 message_loop()->PostDelayedTask( |
| 99 FROM_HERE, | 99 FROM_HERE, |
| 100 task_factory_.NewRunnableMethod(&WifiDataProviderCommon::DoWifiScanTask), | 100 task_factory_.NewRunnableMethod(&WifiDataProviderCommon::DoWifiScanTask), |
| 101 interval); | 101 interval); |
| 102 } | 102 } |
| OLD | NEW |