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

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

Issue 39006: Register SSLManager preferences on linux and mac. (Closed)
Patch Set: Created 11 years, 9 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 | « no previous file | no next file » | 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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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_manager.h" 7 #include "chrome/browser/autofill_manager.h"
8 #include "chrome/browser/browser.h" 8 #include "chrome/browser/browser.h"
9 #include "chrome/browser/browser_shutdown.h" 9 #include "chrome/browser/browser_shutdown.h"
10 #include "chrome/browser/cache_manager_host.h" 10 #include "chrome/browser/cache_manager_host.h"
11 #include "chrome/browser/download/download_manager.h" 11 #include "chrome/browser/download/download_manager.h"
12 #include "chrome/browser/google_url_tracker.h"
12 #include "chrome/browser/metrics/metrics_service.h" 13 #include "chrome/browser/metrics/metrics_service.h"
13 #include "chrome/browser/net/dns_global.h" 14 #include "chrome/browser/net/dns_global.h"
14 #include "chrome/browser/password_manager/password_manager.h" 15 #include "chrome/browser/password_manager/password_manager.h"
15 #include "chrome/browser/renderer_host/browser_render_process_host.h" 16 #include "chrome/browser/renderer_host/browser_render_process_host.h"
16 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" 17 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
17 #include "chrome/browser/google_url_tracker.h"
18 #include "chrome/browser/session_startup_pref.h" 18 #include "chrome/browser/session_startup_pref.h"
19 #include "chrome/browser/ssl/ssl_manager.h"
19 #include "chrome/browser/tab_contents/web_contents.h" 20 #include "chrome/browser/tab_contents/web_contents.h"
20 21
21 #if defined(OS_WIN) // TODO(port): whittle this down as we port 22 #if defined(OS_WIN) // TODO(port): whittle this down as we port
22 #include "chrome/browser/external_protocol_handler.h" 23 #include "chrome/browser/external_protocol_handler.h"
23 #include "chrome/browser/safe_browsing/safe_browsing_service.h" 24 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
24 #include "chrome/browser/spellchecker.h" 25 #include "chrome/browser/spellchecker.h"
25 #include "chrome/browser/ssl/ssl_manager.h"
26 #include "chrome/browser/task_manager.h" 26 #include "chrome/browser/task_manager.h"
27 #include "chrome/browser/views/bookmark_bar_view.h" 27 #include "chrome/browser/views/bookmark_bar_view.h"
28 #include "chrome/browser/views/bookmark_manager_view.h" 28 #include "chrome/browser/views/bookmark_manager_view.h"
29 #include "chrome/browser/views/bookmark_table_view.h" 29 #include "chrome/browser/views/bookmark_table_view.h"
30 #include "chrome/browser/views/frame/browser_view.h" 30 #include "chrome/browser/views/frame/browser_view.h"
31 #include "chrome/browser/views/keyword_editor_view.h" 31 #include "chrome/browser/views/keyword_editor_view.h"
32 #include "chrome/browser/views/page_info_window.h" 32 #include "chrome/browser/views/page_info_window.h"
33 #endif 33 #endif
34 34
35 namespace browser { 35 namespace browser {
(...skipping 16 matching lines...) Expand all
52 TaskManager::RegisterPrefs(local_state); 52 TaskManager::RegisterPrefs(local_state);
53 ExternalProtocolHandler::RegisterPrefs(local_state); 53 ExternalProtocolHandler::RegisterPrefs(local_state);
54 #endif 54 #endif
55 55
56 // User prefs 56 // User prefs
57 SessionStartupPref::RegisterUserPrefs(user_prefs); 57 SessionStartupPref::RegisterUserPrefs(user_prefs);
58 Browser::RegisterUserPrefs(user_prefs); 58 Browser::RegisterUserPrefs(user_prefs);
59 PasswordManager::RegisterUserPrefs(user_prefs); 59 PasswordManager::RegisterUserPrefs(user_prefs);
60 chrome_browser_net::RegisterUserPrefs(user_prefs); 60 chrome_browser_net::RegisterUserPrefs(user_prefs);
61 DownloadManager::RegisterUserPrefs(user_prefs); 61 DownloadManager::RegisterUserPrefs(user_prefs);
62 SSLManager::RegisterUserPrefs(user_prefs);
62 #if defined(OS_WIN) // TODO(port): whittle this down as we port 63 #if defined(OS_WIN) // TODO(port): whittle this down as we port
63 BookmarkBarView::RegisterUserPrefs(user_prefs); 64 BookmarkBarView::RegisterUserPrefs(user_prefs);
64 BookmarkTableView::RegisterUserPrefs(user_prefs); 65 BookmarkTableView::RegisterUserPrefs(user_prefs);
65 SSLManager::RegisterUserPrefs(user_prefs);
66 #endif 66 #endif
67 AutofillManager::RegisterUserPrefs(user_prefs); 67 AutofillManager::RegisterUserPrefs(user_prefs);
68 TabContents::RegisterUserPrefs(user_prefs); 68 TabContents::RegisterUserPrefs(user_prefs);
69 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); 69 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs);
70 WebContents::RegisterUserPrefs(user_prefs); 70 WebContents::RegisterUserPrefs(user_prefs);
71 } 71 }
72 72
73 } // namespace browser 73 } // namespace browser
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698