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

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

Issue 330143002: Simplify geolocation permission request in the Content API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 6 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/browser/ui/app_list/test/fake_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 <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 23 matching lines...) Expand all
34 #include "chrome/browser/chrome_notification_types.h" 34 #include "chrome/browser/chrome_notification_types.h"
35 #include "chrome/browser/content_settings/cookie_settings.h" 35 #include "chrome/browser/content_settings/cookie_settings.h"
36 #include "chrome/browser/content_settings/host_content_settings_map.h" 36 #include "chrome/browser/content_settings/host_content_settings_map.h"
37 #include "chrome/browser/dom_distiller/dom_distiller_service_factory.h" 37 #include "chrome/browser/dom_distiller/dom_distiller_service_factory.h"
38 #include "chrome/browser/dom_distiller/lazy_dom_distiller_service.h" 38 #include "chrome/browser/dom_distiller/lazy_dom_distiller_service.h"
39 #include "chrome/browser/download/chrome_download_manager_delegate.h" 39 #include "chrome/browser/download/chrome_download_manager_delegate.h"
40 #include "chrome/browser/download/download_service.h" 40 #include "chrome/browser/download/download_service.h"
41 #include "chrome/browser/download/download_service_factory.h" 41 #include "chrome/browser/download/download_service_factory.h"
42 #include "chrome/browser/extensions/extension_service.h" 42 #include "chrome/browser/extensions/extension_service.h"
43 #include "chrome/browser/extensions/extension_special_storage_policy.h" 43 #include "chrome/browser/extensions/extension_special_storage_policy.h"
44 #include "chrome/browser/geolocation/chrome_geolocation_permission_context.h"
45 #include "chrome/browser/geolocation/chrome_geolocation_permission_context_facto ry.h"
46 #include "chrome/browser/history/top_sites.h" 44 #include "chrome/browser/history/top_sites.h"
47 #include "chrome/browser/media/chrome_midi_permission_context.h" 45 #include "chrome/browser/media/chrome_midi_permission_context.h"
48 #include "chrome/browser/media/chrome_midi_permission_context_factory.h" 46 #include "chrome/browser/media/chrome_midi_permission_context_factory.h"
49 #include "chrome/browser/net/chrome_url_request_context.h" 47 #include "chrome/browser/net/chrome_url_request_context.h"
50 #include "chrome/browser/net/net_pref_observer.h" 48 #include "chrome/browser/net/net_pref_observer.h"
51 #include "chrome/browser/net/predictor.h" 49 #include "chrome/browser/net/predictor.h"
52 #include "chrome/browser/net/pref_proxy_config_tracker.h" 50 #include "chrome/browser/net/pref_proxy_config_tracker.h"
53 #include "chrome/browser/net/proxy_service_factory.h" 51 #include "chrome/browser/net/proxy_service_factory.h"
54 #include "chrome/browser/net/ssl_config_service_manager.h" 52 #include "chrome/browser/net/ssl_config_service_manager.h"
55 #include "chrome/browser/plugins/chrome_plugin_service_filter.h" 53 #include "chrome/browser/plugins/chrome_plugin_service_filter.h"
(...skipping 1006 matching lines...) Expand 10 before | Expand all | Expand 10 after
1062 return ssl_config_service_manager_->Get(); 1060 return ssl_config_service_manager_->Get();
1063 } 1061 }
1064 1062
1065 HostContentSettingsMap* ProfileImpl::GetHostContentSettingsMap() { 1063 HostContentSettingsMap* ProfileImpl::GetHostContentSettingsMap() {
1066 if (!host_content_settings_map_.get()) { 1064 if (!host_content_settings_map_.get()) {
1067 host_content_settings_map_ = new HostContentSettingsMap(GetPrefs(), false); 1065 host_content_settings_map_ = new HostContentSettingsMap(GetPrefs(), false);
1068 } 1066 }
1069 return host_content_settings_map_.get(); 1067 return host_content_settings_map_.get();
1070 } 1068 }
1071 1069
1072 content::GeolocationPermissionContext*
1073 ProfileImpl::GetGeolocationPermissionContext() {
1074 return ChromeGeolocationPermissionContextFactory::GetForProfile(this);
1075 }
1076
1077 content::BrowserPluginGuestManager* ProfileImpl::GetGuestManager() { 1070 content::BrowserPluginGuestManager* ProfileImpl::GetGuestManager() {
1078 #if defined(ENABLE_EXTENSIONS) 1071 #if defined(ENABLE_EXTENSIONS)
1079 return GuestViewManager::FromBrowserContext(this); 1072 return GuestViewManager::FromBrowserContext(this);
1080 #else 1073 #else
1081 return NULL; 1074 return NULL;
1082 #endif 1075 #endif
1083 } 1076 }
1084 1077
1085 DownloadManagerDelegate* ProfileImpl::GetDownloadManagerDelegate() { 1078 DownloadManagerDelegate* ProfileImpl::GetDownloadManagerDelegate() {
1086 return DownloadServiceFactory::GetForBrowserContext(this)-> 1079 return DownloadServiceFactory::GetForBrowserContext(this)->
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
1374 PrefProxyConfigTracker* ProfileImpl::CreateProxyConfigTracker() { 1367 PrefProxyConfigTracker* ProfileImpl::CreateProxyConfigTracker() {
1375 #if defined(OS_CHROMEOS) 1368 #if defined(OS_CHROMEOS)
1376 if (chromeos::ProfileHelper::IsSigninProfile(this)) { 1369 if (chromeos::ProfileHelper::IsSigninProfile(this)) {
1377 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( 1370 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(
1378 g_browser_process->local_state()); 1371 g_browser_process->local_state());
1379 } 1372 }
1380 #endif // defined(OS_CHROMEOS) 1373 #endif // defined(OS_CHROMEOS)
1381 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( 1374 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile(
1382 GetPrefs(), g_browser_process->local_state()); 1375 GetPrefs(), g_browser_process->local_state());
1383 } 1376 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_impl.h ('k') | chrome/browser/ui/app_list/test/fake_profile.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698