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/core_location_provider_mac.h" | 5 #include "content/browser/geolocation/core_location_provider_mac.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "content/browser/geolocation/core_location_data_provider_mac.h" | 9 #include "content/browser/geolocation/core_location_data_provider_mac.h" |
10 #include "content/public/common/content_switches.h" | 10 #include "content/public/common/content_switches.h" |
(...skipping 18 matching lines...) Expand all Loading... |
29 | 29 |
30 is_updating_ = data_provider_->StartUpdating(this); | 30 is_updating_ = data_provider_->StartUpdating(this); |
31 return true; | 31 return true; |
32 } | 32 } |
33 | 33 |
34 void CoreLocationProviderMac::StopProvider() { | 34 void CoreLocationProviderMac::StopProvider() { |
35 data_provider_->StopUpdating(); | 35 data_provider_->StopUpdating(); |
36 is_updating_ = false; | 36 is_updating_ = false; |
37 } | 37 } |
38 | 38 |
39 void CoreLocationProviderMac::GetPosition(Geoposition* position) { | 39 void CoreLocationProviderMac::GetPosition(content::Geoposition* position) { |
40 DCHECK(position); | 40 DCHECK(position); |
41 *position = position_; | 41 *position = position_; |
42 DCHECK(position->IsInitialized()); | 42 DCHECK(position->Validate() || |
| 43 position->error_code != content::Geoposition::ERROR_CODE_NONE); |
43 } | 44 } |
44 | 45 |
45 void CoreLocationProviderMac::SetPosition(Geoposition* position) { | 46 void CoreLocationProviderMac::SetPosition(content::Geoposition* position) { |
46 DCHECK(position); | 47 DCHECK(position); |
47 position_ = *position; | 48 position_ = *position; |
48 DCHECK(position->IsInitialized()); | 49 DCHECK(position->Validate() || |
49 | 50 position->error_code != content::Geoposition::ERROR_CODE_NONE); |
50 UpdateListeners(); | 51 UpdateListeners(); |
51 } | 52 } |
52 | 53 |
53 LocationProviderBase* NewSystemLocationProvider() { | 54 LocationProviderBase* NewSystemLocationProvider() { |
54 if (CommandLine::ForCurrentProcess()->HasSwitch( | 55 if (CommandLine::ForCurrentProcess()->HasSwitch( |
55 switches::kExperimentalLocationFeatures)) { | 56 switches::kExperimentalLocationFeatures)) { |
56 return new CoreLocationProviderMac; | 57 return new CoreLocationProviderMac; |
57 } | 58 } |
58 return NULL; | 59 return NULL; |
59 } | 60 } |
OLD | NEW |