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/profiles/incognito_helpers.h" |
7 #include "chrome/browser/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
8 #include "chrome/browser/profiles/profile_dependency_manager.h" | 9 #include "chrome/browser/profiles/profile_dependency_manager.h" |
9 #include "chrome/common/pref_names.h" | 10 #include "chrome/common/pref_names.h" |
10 #include "components/user_prefs/pref_registry_syncable.h" | 11 #include "components/user_prefs/pref_registry_syncable.h" |
11 #if defined(OS_ANDROID) | 12 #if defined(OS_ANDROID) |
12 #include "chrome/browser/geolocation/chrome_geolocation_permission_context_andro
id.h" | 13 #include "chrome/browser/geolocation/chrome_geolocation_permission_context_andro
id.h" |
13 #else | 14 #else |
14 #include "chrome/browser/geolocation/chrome_geolocation_permission_context.h" | 15 #include "chrome/browser/geolocation/chrome_geolocation_permission_context.h" |
15 #endif | 16 #endif |
16 | 17 |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
74 | 75 |
75 void ChromeGeolocationPermissionContextFactory::RegisterUserPrefs( | 76 void ChromeGeolocationPermissionContextFactory::RegisterUserPrefs( |
76 PrefRegistrySyncable* registry) { | 77 PrefRegistrySyncable* registry) { |
77 #if defined(OS_ANDROID) | 78 #if defined(OS_ANDROID) |
78 registry->RegisterBooleanPref(prefs::kGeolocationEnabled, | 79 registry->RegisterBooleanPref(prefs::kGeolocationEnabled, |
79 true, | 80 true, |
80 PrefRegistrySyncable::UNSYNCABLE_PREF); | 81 PrefRegistrySyncable::UNSYNCABLE_PREF); |
81 #endif | 82 #endif |
82 } | 83 } |
83 | 84 |
84 bool ChromeGeolocationPermissionContextFactory:: | 85 content::BrowserContext* |
85 ServiceRedirectedInIncognito() const { | 86 ChromeGeolocationPermissionContextFactory::GetBrowserContextToUse( |
86 return false; | 87 content::BrowserContext* context) const { |
| 88 return chrome::GetBrowserContextOwnInstanceInIncognito(context); |
87 } | 89 } |
88 | |
89 bool ChromeGeolocationPermissionContextFactory:: | |
90 ServiceHasOwnInstanceInIncognito() const { | |
91 return true; | |
92 } | |
OLD | NEW |