| OLD | NEW |
| 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 #include "chrome/browser/geolocation/chrome_geolocation_permission_context_facto
ry.h" | 5 #include "chrome/browser/geolocation/chrome_geolocation_permission_context_facto
ry.h" |
| 6 | 6 |
| 7 #include "chrome/browser/prefs/pref_registry_syncable.h" | |
| 8 #include "chrome/browser/profiles/profile_dependency_manager.h" | 7 #include "chrome/browser/profiles/profile_dependency_manager.h" |
| 9 #include "chrome/common/pref_names.h" | 8 #include "chrome/common/pref_names.h" |
| 9 #include "components/user_prefs/pref_registry_syncable.h" |
| 10 #if defined(OS_ANDROID) | 10 #if defined(OS_ANDROID) |
| 11 #include "chrome/browser/geolocation/chrome_geolocation_permission_context_andro
id.h" | 11 #include "chrome/browser/geolocation/chrome_geolocation_permission_context_andro
id.h" |
| 12 #else | 12 #else |
| 13 #include "chrome/browser/geolocation/chrome_geolocation_permission_context.h" | 13 #include "chrome/browser/geolocation/chrome_geolocation_permission_context.h" |
| 14 #endif | 14 #endif |
| 15 | 15 |
| 16 namespace { | 16 namespace { |
| 17 | 17 |
| 18 class Service : public ProfileKeyedService { | 18 class Service : public ProfileKeyedService { |
| 19 public: | 19 public: |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 registry->RegisterBooleanPref(prefs::kGeolocationEnabled, | 77 registry->RegisterBooleanPref(prefs::kGeolocationEnabled, |
| 78 true, | 78 true, |
| 79 PrefRegistrySyncable::UNSYNCABLE_PREF); | 79 PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 80 #endif | 80 #endif |
| 81 } | 81 } |
| 82 | 82 |
| 83 bool ChromeGeolocationPermissionContextFactory:: | 83 bool ChromeGeolocationPermissionContextFactory:: |
| 84 ServiceRedirectedInIncognito() const { | 84 ServiceRedirectedInIncognito() const { |
| 85 return true; | 85 return true; |
| 86 } | 86 } |
| OLD | NEW |