diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-16 07:00:37 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-16 07:00:37 +0000 |
| commit | c5cf01030dac86a81f79a38979a8000c640da0ec (patch) | |
| tree | 7ebdc0981eae5647979cc2a0c2b1b10f95cd667a | |
| parent | 93ee5f800cd4ab05256bb131f88365b1975b4e95 (diff) | |
| download | chromium_src-c5cf01030dac86a81f79a38979a8000c640da0ec.zip chromium_src-c5cf01030dac86a81f79a38979a8000c640da0ec.tar.gz chromium_src-c5cf01030dac86a81f79a38979a8000c640da0ec.tar.bz2 | |
Register some more prefs on startup, now that their modules work.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9850 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/browser_prefs.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/browser_prefs.cc b/chrome/browser/browser_prefs.cc index 70055ca..38745fa 100644 --- a/chrome/browser/browser_prefs.cc +++ b/chrome/browser/browser_prefs.cc @@ -5,6 +5,7 @@ #include "chrome/browser/browser_prefs.h" #include "chrome/browser/browser.h" +#include "chrome/browser/browser_shutdown.h" #include "chrome/browser/cache_manager_host.h" #include "chrome/browser/metrics/metrics_service.h" #include "chrome/browser/password_manager/password_manager.h" @@ -16,7 +17,6 @@ #if defined(OS_WIN) // TODO(port): whittle this down as we port #include "chrome/browser/autofill_manager.h" -#include "chrome/browser/browser_shutdown.h" #include "chrome/browser/net/dns_global.h" #include "chrome/browser/download/download_manager.h" #include "chrome/browser/external_protocol_handler.h" @@ -43,10 +43,10 @@ void RegisterAllPrefs(PrefService* user_prefs, PrefService* local_state) { SafeBrowsingService::RegisterPrefs(local_state); MetricsLog::RegisterPrefs(local_state); MetricsService::RegisterPrefs(local_state); + browser_shutdown::RegisterPrefs(local_state); #if defined(OS_WIN) // TODO(port): whittle this down as we port BookmarkManagerView::RegisterPrefs(local_state); BrowserView::RegisterBrowserViewPrefs(local_state); - browser_shutdown::RegisterPrefs(local_state); chrome_browser_net::RegisterPrefs(local_state); PageInfoWindow::RegisterPrefs(local_state); TaskManager::RegisterPrefs(local_state); |