| Index: chrome/browser/browser_prefs.cc
|
| diff --git a/chrome/browser/browser_prefs.cc b/chrome/browser/browser_prefs.cc
|
| index 3625995263460398c7968446aa945bf5a3b85497..5a504440776310405e3bf48ecd0ca3038b6d8ce3 100644
|
| --- a/chrome/browser/browser_prefs.cc
|
| +++ b/chrome/browser/browser_prefs.cc
|
| @@ -9,20 +9,20 @@
|
| #include "chrome/browser/browser_shutdown.h"
|
| #include "chrome/browser/cache_manager_host.h"
|
| #include "chrome/browser/download/download_manager.h"
|
| +#include "chrome/browser/google_url_tracker.h"
|
| #include "chrome/browser/metrics/metrics_service.h"
|
| #include "chrome/browser/net/dns_global.h"
|
| #include "chrome/browser/password_manager/password_manager.h"
|
| #include "chrome/browser/renderer_host/browser_render_process_host.h"
|
| #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
|
| -#include "chrome/browser/google_url_tracker.h"
|
| #include "chrome/browser/session_startup_pref.h"
|
| +#include "chrome/browser/ssl/ssl_manager.h"
|
| #include "chrome/browser/tab_contents/web_contents.h"
|
|
|
| #if defined(OS_WIN) // TODO(port): whittle this down as we port
|
| #include "chrome/browser/external_protocol_handler.h"
|
| #include "chrome/browser/safe_browsing/safe_browsing_service.h"
|
| #include "chrome/browser/spellchecker.h"
|
| -#include "chrome/browser/ssl/ssl_manager.h"
|
| #include "chrome/browser/task_manager.h"
|
| #include "chrome/browser/views/bookmark_bar_view.h"
|
| #include "chrome/browser/views/bookmark_manager_view.h"
|
| @@ -59,10 +59,10 @@ void RegisterAllPrefs(PrefService* user_prefs, PrefService* local_state) {
|
| PasswordManager::RegisterUserPrefs(user_prefs);
|
| chrome_browser_net::RegisterUserPrefs(user_prefs);
|
| DownloadManager::RegisterUserPrefs(user_prefs);
|
| + SSLManager::RegisterUserPrefs(user_prefs);
|
| #if defined(OS_WIN) // TODO(port): whittle this down as we port
|
| BookmarkBarView::RegisterUserPrefs(user_prefs);
|
| BookmarkTableView::RegisterUserPrefs(user_prefs);
|
| - SSLManager::RegisterUserPrefs(user_prefs);
|
| #endif
|
| AutofillManager::RegisterUserPrefs(user_prefs);
|
| TabContents::RegisterUserPrefs(user_prefs);
|
|
|