Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(32)

Side by Side Diff: chrome/browser/profiles/profile_impl.cc

Issue 11587003: Make ChromeGeolocationPermissionContextFactory a ProfileKeyedServiceFactory (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address sky's comments. Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/profiles/profile_impl.h ('k') | chrome/test/base/testing_profile.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/profiles/profile_impl.h" 5 #include "chrome/browser/profiles/profile_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 833 matching lines...) Expand 10 before | Expand all | Expand 10 after
844 844
845 HostContentSettingsMap* ProfileImpl::GetHostContentSettingsMap() { 845 HostContentSettingsMap* ProfileImpl::GetHostContentSettingsMap() {
846 if (!host_content_settings_map_.get()) { 846 if (!host_content_settings_map_.get()) {
847 host_content_settings_map_ = new HostContentSettingsMap(GetPrefs(), false); 847 host_content_settings_map_ = new HostContentSettingsMap(GetPrefs(), false);
848 } 848 }
849 return host_content_settings_map_.get(); 849 return host_content_settings_map_.get();
850 } 850 }
851 851
852 content::GeolocationPermissionContext* 852 content::GeolocationPermissionContext*
853 ProfileImpl::GetGeolocationPermissionContext() { 853 ProfileImpl::GetGeolocationPermissionContext() {
854 if (!geolocation_permission_context_.get()) { 854 return ChromeGeolocationPermissionContextFactory::GetForProfile(this);
855 geolocation_permission_context_ =
856 ChromeGeolocationPermissionContextFactory::Create(this);
857 }
858 return geolocation_permission_context_.get();
859 } 855 }
860 856
861 content::SpeechRecognitionPreferences* 857 content::SpeechRecognitionPreferences*
862 ProfileImpl::GetSpeechRecognitionPreferences() { 858 ProfileImpl::GetSpeechRecognitionPreferences() {
863 #if defined(ENABLE_INPUT_SPEECH) 859 #if defined(ENABLE_INPUT_SPEECH)
864 return ChromeSpeechRecognitionPreferences::GetForProfile(this); 860 return ChromeSpeechRecognitionPreferences::GetForProfile(this);
865 #else 861 #else
866 return NULL; 862 return NULL;
867 #endif 863 #endif
868 } 864 }
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
1139 if (!path.empty()) 1135 if (!path.empty())
1140 *cache_path = path; 1136 *cache_path = path;
1141 *max_size = is_media_context ? prefs_->GetInteger(prefs::kMediaCacheSize) : 1137 *max_size = is_media_context ? prefs_->GetInteger(prefs::kMediaCacheSize) :
1142 prefs_->GetInteger(prefs::kDiskCacheSize); 1138 prefs_->GetInteger(prefs::kDiskCacheSize);
1143 } 1139 }
1144 1140
1145 base::Callback<ChromeURLDataManagerBackend*(void)> 1141 base::Callback<ChromeURLDataManagerBackend*(void)>
1146 ProfileImpl::GetChromeURLDataManagerBackendGetter() const { 1142 ProfileImpl::GetChromeURLDataManagerBackendGetter() const {
1147 return io_data_.GetChromeURLDataManagerBackendGetter(); 1143 return io_data_.GetChromeURLDataManagerBackendGetter();
1148 } 1144 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_impl.h ('k') | chrome/test/base/testing_profile.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698