diff options
Diffstat (limited to 'chrome/browser/browser_prefs.cc')
| -rw-r--r-- | chrome/browser/browser_prefs.cc | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/chrome/browser/browser_prefs.cc b/chrome/browser/browser_prefs.cc index ca50616..a33c68a 100644 --- a/chrome/browser/browser_prefs.cc +++ b/chrome/browser/browser_prefs.cc @@ -5,9 +5,6 @@ #include "chrome/browser/browser_prefs.h" #include "chrome/browser/browser.h" -#include "chrome/browser/session_startup_pref.h" - -#if defined(OS_WIN) #include "chrome/browser/browser_shutdown.h" #include "chrome/browser/cache_manager_host.h" #include "chrome/browser/net/dns_global.h" @@ -18,8 +15,10 @@ #include "chrome/browser/password_manager/password_manager.h" #include "chrome/browser/renderer_host/browser_render_process_host.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" +#include "chrome/browser/session_startup_pref.h" #include "chrome/browser/spellchecker.h" #include "chrome/browser/ssl/ssl_manager.h" +#include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/task_manager.h" #include "chrome/browser/search_engines/template_url_prepopulate_data.h" #include "chrome/browser/views/bookmark_bar_view.h" @@ -29,13 +28,11 @@ #include "chrome/browser/views/keyword_editor_view.h" #include "chrome/browser/views/page_info_window.h" #include "chrome/browser/tab_contents/web_contents.h" -#endif namespace browser { void RegisterAllPrefs(PrefService* user_prefs, PrefService* local_state) { // Prefs in Local State -#if defined(OS_WIN) BookmarkManagerView::RegisterPrefs(local_state); Browser::RegisterPrefs(local_state); BrowserView::RegisterBrowserViewPrefs(local_state); @@ -50,22 +47,19 @@ void RegisterAllPrefs(PrefService* user_prefs, PrefService* local_state) { TaskManager::RegisterPrefs(local_state); ExternalProtocolHandler::RegisterPrefs(local_state); SafeBrowsingService::RegisterPrefs(local_state); -#endif // User prefs - SessionStartupPref::RegisterUserPrefs(user_prefs); -#if defined(OS_WIN) BookmarkBarView::RegisterUserPrefs(user_prefs); BookmarkTableView::RegisterUserPrefs(user_prefs); Browser::RegisterUserPrefs(user_prefs); chrome_browser_net::RegisterUserPrefs(user_prefs); DownloadManager::RegisterUserPrefs(user_prefs); PasswordManager::RegisterUserPrefs(user_prefs); + SessionStartupPref::RegisterUserPrefs(user_prefs); SSLManager::RegisterUserPrefs(user_prefs); TabContents::RegisterUserPrefs(user_prefs); TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); WebContents::RegisterUserPrefs(user_prefs); -#endif } } // namespace browser |