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

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

Issue 5367006: Refactor: move HostContentSettingsMap to content_settings (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase again Created 10 years 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
OLDNEW
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 "chrome/browser/profile_impl.h" 5 #include "chrome/browser/profile_impl.h"
6 6
7 #include "app/resource_bundle.h" 7 #include "app/resource_bundle.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/environment.h" 9 #include "base/environment.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
11 #include "base/file_util.h" 11 #include "base/file_util.h"
12 #include "base/metrics/histogram.h" 12 #include "base/metrics/histogram.h"
13 #include "base/path_service.h" 13 #include "base/path_service.h"
14 #include "base/scoped_ptr.h" 14 #include "base/scoped_ptr.h"
15 #include "base/string_number_conversions.h" 15 #include "base/string_number_conversions.h"
16 #include "base/string_util.h" 16 #include "base/string_util.h"
17 #include "chrome/browser/about_flags.h" 17 #include "chrome/browser/about_flags.h"
18 #include "chrome/browser/appcache/chrome_appcache_service.h" 18 #include "chrome/browser/appcache/chrome_appcache_service.h"
19 #include "chrome/browser/autocomplete/autocomplete_classifier.h" 19 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
20 #include "chrome/browser/autofill/personal_data_manager.h" 20 #include "chrome/browser/autofill/personal_data_manager.h"
21 #include "chrome/browser/background_contents_service.h" 21 #include "chrome/browser/background_contents_service.h"
22 #include "chrome/browser/background_mode_manager.h" 22 #include "chrome/browser/background_mode_manager.h"
23 #include "chrome/browser/bookmarks/bookmark_model.h" 23 #include "chrome/browser/bookmarks/bookmark_model.h"
24 #include "chrome/browser/browser_list.h" 24 #include "chrome/browser/browser_list.h"
25 #include "chrome/browser/browser_process.h" 25 #include "chrome/browser/browser_process.h"
26 #include "chrome/browser/browser_signin.h" 26 #include "chrome/browser/browser_signin.h"
27 #include "chrome/browser/browser_thread.h" 27 #include "chrome/browser/browser_thread.h"
28 #include "chrome/browser/chrome_blob_storage_context.h" 28 #include "chrome/browser/chrome_blob_storage_context.h"
29 #include "chrome/browser/content_settings/host_content_settings_map.h"
29 #include "chrome/browser/dom_ui/ntp_resource_cache.h" 30 #include "chrome/browser/dom_ui/ntp_resource_cache.h"
30 #include "chrome/browser/download/download_manager.h" 31 #include "chrome/browser/download/download_manager.h"
31 #include "chrome/browser/extensions/default_apps.h" 32 #include "chrome/browser/extensions/default_apps.h"
32 #include "chrome/browser/extensions/extension_devtools_manager.h" 33 #include "chrome/browser/extensions/extension_devtools_manager.h"
33 #include "chrome/browser/extensions/extension_error_reporter.h" 34 #include "chrome/browser/extensions/extension_error_reporter.h"
34 #include "chrome/browser/extensions/extension_info_map.h" 35 #include "chrome/browser/extensions/extension_info_map.h"
35 #include "chrome/browser/extensions/extension_event_router.h" 36 #include "chrome/browser/extensions/extension_event_router.h"
36 #include "chrome/browser/extensions/extension_message_service.h" 37 #include "chrome/browser/extensions/extension_message_service.h"
37 #include "chrome/browser/extensions/extension_process_manager.h" 38 #include "chrome/browser/extensions/extension_process_manager.h"
38 #include "chrome/browser/extensions/extensions_service.h" 39 #include "chrome/browser/extensions/extensions_service.h"
39 #include "chrome/browser/extensions/user_script_master.h" 40 #include "chrome/browser/extensions/user_script_master.h"
40 #include "chrome/browser/favicon_service.h" 41 #include "chrome/browser/favicon_service.h"
41 #include "chrome/browser/file_system/browser_file_system_context.h" 42 #include "chrome/browser/file_system/browser_file_system_context.h"
42 #include "chrome/browser/find_bar_state.h" 43 #include "chrome/browser/find_bar_state.h"
43 #include "chrome/browser/geolocation/geolocation_content_settings_map.h" 44 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"
44 #include "chrome/browser/geolocation/geolocation_permission_context.h" 45 #include "chrome/browser/geolocation/geolocation_permission_context.h"
45 #include "chrome/browser/history/history.h" 46 #include "chrome/browser/history/history.h"
46 #include "chrome/browser/history/top_sites.h" 47 #include "chrome/browser/history/top_sites.h"
47 #include "chrome/browser/host_content_settings_map.h"
48 #include "chrome/browser/host_zoom_map.h" 48 #include "chrome/browser/host_zoom_map.h"
49 #include "chrome/browser/instant/instant_controller.h" 49 #include "chrome/browser/instant/instant_controller.h"
50 #include "chrome/browser/in_process_webkit/webkit_context.h" 50 #include "chrome/browser/in_process_webkit/webkit_context.h"
51 #include "chrome/browser/net/chrome_url_request_context.h" 51 #include "chrome/browser/net/chrome_url_request_context.h"
52 #include "chrome/browser/net/gaia/token_service.h" 52 #include "chrome/browser/net/gaia/token_service.h"
53 #include "chrome/browser/net/net_pref_observer.h" 53 #include "chrome/browser/net/net_pref_observer.h"
54 #include "chrome/browser/net/pref_proxy_config_service.h" 54 #include "chrome/browser/net/pref_proxy_config_service.h"
55 #include "chrome/browser/net/ssl_config_service_manager.h" 55 #include "chrome/browser/net/ssl_config_service_manager.h"
56 #include "chrome/browser/notifications/desktop_notification_service.h" 56 #include "chrome/browser/notifications/desktop_notification_service.h"
57 #include "chrome/browser/password_manager/password_store_default.h" 57 #include "chrome/browser/password_manager/password_store_default.h"
(...skipping 1264 matching lines...) Expand 10 before | Expand all | Expand 10 after
1322 return chromeos_proxy_config_service_impl_; 1322 return chromeos_proxy_config_service_impl_;
1323 } 1323 }
1324 #endif // defined(OS_CHROMEOS) 1324 #endif // defined(OS_CHROMEOS)
1325 1325
1326 PrefProxyConfigTracker* ProfileImpl::GetProxyConfigTracker() { 1326 PrefProxyConfigTracker* ProfileImpl::GetProxyConfigTracker() {
1327 if (!pref_proxy_config_tracker_) 1327 if (!pref_proxy_config_tracker_)
1328 pref_proxy_config_tracker_ = new PrefProxyConfigTracker(GetPrefs()); 1328 pref_proxy_config_tracker_ = new PrefProxyConfigTracker(GetPrefs());
1329 1329
1330 return pref_proxy_config_tracker_; 1330 return pref_proxy_config_tracker_;
1331 } 1331 }
OLDNEW
« no previous file with comments | « chrome/browser/prefs/browser_prefs.cc ('k') | chrome/browser/renderer_host/database_dispatcher_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698