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

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

Issue 3565006: Decouples certificates viewers from NSS to prepare support for OpenSSL. (Closed)
Patch Set: Comments / ProcessIDN Created 10 years, 2 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/browser/gtk/ssl_client_certificate_selector.cc ('k') | chrome/chrome_browser.gypi » ('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/prefs/browser_prefs.h" 5 #include "chrome/browser/prefs/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/background_mode_manager.h" 9 #include "chrome/browser/background_mode_manager.h"
10 #include "chrome/browser/bookmarks/bookmark_utils.h" 10 #include "chrome/browser/bookmarks/bookmark_utils.h"
11 #include "chrome/browser/browser.h" 11 #include "chrome/browser/browser.h"
12 #include "chrome/browser/browser_shutdown.h" 12 #include "chrome/browser/browser_shutdown.h"
13 #include "chrome/browser/debugger/devtools_manager.h" 13 #include "chrome/browser/debugger/devtools_manager.h"
14 #include "chrome/browser/dom_ui/labs_ui.h" 14 #include "chrome/browser/dom_ui/labs_ui.h"
15 #include "chrome/browser/dom_ui/new_tab_ui.h" 15 #include "chrome/browser/dom_ui/new_tab_ui.h"
16 #include "chrome/browser/dom_ui/plugins_ui.h" 16 #include "chrome/browser/dom_ui/plugins_ui.h"
17 #include "chrome/browser/download/download_prefs.h" 17 #include "chrome/browser/download/download_prefs.h"
18 #include "chrome/browser/extensions/extension_dom_ui.h" 18 #include "chrome/browser/extensions/extension_dom_ui.h"
19 #include "chrome/browser/extensions/extension_prefs.h" 19 #include "chrome/browser/extensions/extension_prefs.h"
20 #include "chrome/browser/extensions/extensions_ui.h" 20 #include "chrome/browser/extensions/extensions_ui.h"
21 #include "chrome/browser/external_protocol_handler.h" 21 #include "chrome/browser/external_protocol_handler.h"
22 #include "chrome/browser/geolocation/geolocation_content_settings_map.h" 22 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"
23 #include "chrome/browser/geolocation/geolocation_prefs.h" 23 #include "chrome/browser/geolocation/geolocation_prefs.h"
24 #include "chrome/browser/google/google_url_tracker.h" 24 #include "chrome/browser/google/google_url_tracker.h"
25 #include "chrome/browser/gtk/certificate_manager.h"
26 #include "chrome/browser/host_content_settings_map.h" 25 #include "chrome/browser/host_content_settings_map.h"
27 #include "chrome/browser/host_zoom_map.h" 26 #include "chrome/browser/host_zoom_map.h"
28 #include "chrome/browser/intranet_redirect_detector.h" 27 #include "chrome/browser/intranet_redirect_detector.h"
29 #include "chrome/browser/labs.h" 28 #include "chrome/browser/labs.h"
30 #include "chrome/browser/metrics/metrics_log.h" 29 #include "chrome/browser/metrics/metrics_log.h"
31 #include "chrome/browser/metrics/metrics_service.h" 30 #include "chrome/browser/metrics/metrics_service.h"
32 #include "chrome/browser/net/chrome_url_request_context.h" 31 #include "chrome/browser/net/chrome_url_request_context.h"
33 #include "chrome/browser/net/predictor_api.h" 32 #include "chrome/browser/net/predictor_api.h"
34 #include "chrome/browser/notifications/desktop_notification_service.h" 33 #include "chrome/browser/notifications/desktop_notification_service.h"
35 #include "chrome/browser/page_info_model.h" 34 #include "chrome/browser/page_info_model.h"
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 PinnedTabCodec::RegisterUserPrefs(user_prefs); 129 PinnedTabCodec::RegisterUserPrefs(user_prefs);
131 ExtensionPrefs::RegisterUserPrefs(user_prefs); 130 ExtensionPrefs::RegisterUserPrefs(user_prefs);
132 GeolocationContentSettingsMap::RegisterUserPrefs(user_prefs); 131 GeolocationContentSettingsMap::RegisterUserPrefs(user_prefs);
133 TranslatePrefs::RegisterUserPrefs(user_prefs); 132 TranslatePrefs::RegisterUserPrefs(user_prefs);
134 DesktopNotificationService::RegisterUserPrefs(user_prefs); 133 DesktopNotificationService::RegisterUserPrefs(user_prefs);
135 ChromeURLRequestContextGetter::RegisterUserPrefs(user_prefs); 134 ChromeURLRequestContextGetter::RegisterUserPrefs(user_prefs);
136 #if defined(TOOLKIT_VIEWS) 135 #if defined(TOOLKIT_VIEWS)
137 BrowserActionsContainer::RegisterUserPrefs(user_prefs); 136 BrowserActionsContainer::RegisterUserPrefs(user_prefs);
138 #elif defined(TOOLKIT_GTK) 137 #elif defined(TOOLKIT_GTK)
139 BrowserWindowGtk::RegisterUserPrefs(user_prefs); 138 BrowserWindowGtk::RegisterUserPrefs(user_prefs);
140 certificate_manager_util::RegisterUserPrefs(user_prefs);
141 #endif 139 #endif
142 #if defined(OS_CHROMEOS) 140 #if defined(OS_CHROMEOS)
143 chromeos::Preferences::RegisterUserPrefs(user_prefs); 141 chromeos::Preferences::RegisterUserPrefs(user_prefs);
144 #endif 142 #endif
145 BackgroundContentsService::RegisterUserPrefs(user_prefs); 143 BackgroundContentsService::RegisterUserPrefs(user_prefs);
146 SigninManager::RegisterUserPrefs(user_prefs); 144 SigninManager::RegisterUserPrefs(user_prefs);
147 TemplateURLModel::RegisterUserPrefs(user_prefs); 145 TemplateURLModel::RegisterUserPrefs(user_prefs);
148 } 146 }
149 147
150 } // namespace browser 148 } // namespace browser
OLDNEW
« no previous file with comments | « chrome/browser/gtk/ssl_client_certificate_selector.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698