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

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

Issue 2862041: Remove abonded privacy blacklist implementation. (Closed)
Patch Set: fix unit tests Created 10 years, 5 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
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/browser_resources.grd » ('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) 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/browser_prefs.h" 5 #include "chrome/browser/browser_prefs.h"
6 6
7 #include "chrome/browser/autofill/autofill_manager.h" 7 #include "chrome/browser/autofill/autofill_manager.h"
8 #include "chrome/browser/background_contents_service.h" 8 #include "chrome/browser/background_contents_service.h"
9 #include "chrome/browser/bookmarks/bookmark_utils.h" 9 #include "chrome/browser/bookmarks/bookmark_utils.h"
10 #include "chrome/browser/browser.h" 10 #include "chrome/browser/browser.h"
(...skipping 13 matching lines...) Expand all
24 #include "chrome/browser/gtk/certificate_manager.h" 24 #include "chrome/browser/gtk/certificate_manager.h"
25 #include "chrome/browser/host_content_settings_map.h" 25 #include "chrome/browser/host_content_settings_map.h"
26 #include "chrome/browser/host_zoom_map.h" 26 #include "chrome/browser/host_zoom_map.h"
27 #include "chrome/browser/intranet_redirect_detector.h" 27 #include "chrome/browser/intranet_redirect_detector.h"
28 #include "chrome/browser/metrics/metrics_service.h" 28 #include "chrome/browser/metrics/metrics_service.h"
29 #include "chrome/browser/net/chrome_url_request_context.h" 29 #include "chrome/browser/net/chrome_url_request_context.h"
30 #include "chrome/browser/net/predictor_api.h" 30 #include "chrome/browser/net/predictor_api.h"
31 #include "chrome/browser/notifications/desktop_notification_service.h" 31 #include "chrome/browser/notifications/desktop_notification_service.h"
32 #include "chrome/browser/page_info_model.h" 32 #include "chrome/browser/page_info_model.h"
33 #include "chrome/browser/password_manager/password_manager.h" 33 #include "chrome/browser/password_manager/password_manager.h"
34 #include "chrome/browser/privacy_blacklist/blacklist.h"
35 #include "chrome/browser/renderer_host/browser_render_process_host.h" 34 #include "chrome/browser/renderer_host/browser_render_process_host.h"
36 #include "chrome/browser/renderer_host/web_cache_manager.h" 35 #include "chrome/browser/renderer_host/web_cache_manager.h"
37 #include "chrome/browser/safe_browsing/safe_browsing_service.h" 36 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
38 #include "chrome/browser/search_engines/keyword_editor_controller.h" 37 #include "chrome/browser/search_engines/keyword_editor_controller.h"
39 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" 38 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
40 #include "chrome/browser/session_startup_pref.h" 39 #include "chrome/browser/session_startup_pref.h"
41 #include "chrome/browser/ssl/ssl_manager.h" 40 #include "chrome/browser/ssl/ssl_manager.h"
42 #include "chrome/browser/tabs/pinned_tab_codec.h" 41 #include "chrome/browser/tabs/pinned_tab_codec.h"
43 #include "chrome/browser/tab_contents/tab_contents.h" 42 #include "chrome/browser/tab_contents/tab_contents.h"
44 #include "chrome/browser/task_manager.h" 43 #include "chrome/browser/task_manager.h"
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 bookmark_utils::RegisterUserPrefs(user_prefs); 107 bookmark_utils::RegisterUserPrefs(user_prefs);
109 TabContents::RegisterUserPrefs(user_prefs); 108 TabContents::RegisterUserPrefs(user_prefs);
110 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); 109 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs);
111 ExtensionDOMUI::RegisterUserPrefs(user_prefs); 110 ExtensionDOMUI::RegisterUserPrefs(user_prefs);
112 ExtensionsUI::RegisterUserPrefs(user_prefs); 111 ExtensionsUI::RegisterUserPrefs(user_prefs);
113 NewTabUI::RegisterUserPrefs(user_prefs); 112 NewTabUI::RegisterUserPrefs(user_prefs);
114 PluginsUI::RegisterUserPrefs(user_prefs); 113 PluginsUI::RegisterUserPrefs(user_prefs);
115 HostContentSettingsMap::RegisterUserPrefs(user_prefs); 114 HostContentSettingsMap::RegisterUserPrefs(user_prefs);
116 HostZoomMap::RegisterUserPrefs(user_prefs); 115 HostZoomMap::RegisterUserPrefs(user_prefs);
117 DevToolsManager::RegisterUserPrefs(user_prefs); 116 DevToolsManager::RegisterUserPrefs(user_prefs);
118 Blacklist::RegisterUserPrefs(user_prefs);
119 PinnedTabCodec::RegisterUserPrefs(user_prefs); 117 PinnedTabCodec::RegisterUserPrefs(user_prefs);
120 ExtensionPrefs::RegisterUserPrefs(user_prefs); 118 ExtensionPrefs::RegisterUserPrefs(user_prefs);
121 GeolocationContentSettingsMap::RegisterUserPrefs(user_prefs); 119 GeolocationContentSettingsMap::RegisterUserPrefs(user_prefs);
122 TranslatePrefs::RegisterUserPrefs(user_prefs); 120 TranslatePrefs::RegisterUserPrefs(user_prefs);
123 DesktopNotificationService::RegisterUserPrefs(user_prefs); 121 DesktopNotificationService::RegisterUserPrefs(user_prefs);
124 ChromeURLRequestContextGetter::RegisterUserPrefs(user_prefs); 122 ChromeURLRequestContextGetter::RegisterUserPrefs(user_prefs);
125 #if defined(TOOLKIT_VIEWS) 123 #if defined(TOOLKIT_VIEWS)
126 BrowserActionsContainer::RegisterUserPrefs(user_prefs); 124 BrowserActionsContainer::RegisterUserPrefs(user_prefs);
127 #elif defined(TOOLKIT_GTK) 125 #elif defined(TOOLKIT_GTK)
128 BrowserWindowGtk::RegisterUserPrefs(user_prefs); 126 BrowserWindowGtk::RegisterUserPrefs(user_prefs);
129 certificate_manager_util::RegisterUserPrefs(user_prefs); 127 certificate_manager_util::RegisterUserPrefs(user_prefs);
130 #endif 128 #endif
131 #if defined(OS_CHROMEOS) 129 #if defined(OS_CHROMEOS)
132 chromeos::Preferences::RegisterUserPrefs(user_prefs); 130 chromeos::Preferences::RegisterUserPrefs(user_prefs);
133 #endif 131 #endif
134 BackgroundContentsService::RegisterUserPrefs(user_prefs); 132 BackgroundContentsService::RegisterUserPrefs(user_prefs);
135 } 133 }
136 134
137 } // namespace browser 135 } // namespace browser
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/browser_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698