diff options
| author | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-03 01:09:53 +0000 |
|---|---|---|
| committer | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-03 01:09:53 +0000 |
| commit | e94980027dc5cd1fb34950cddc18c629328a7e5b (patch) | |
| tree | 3f0a131b5776c7e5fe2725c616a631933391c6f5 /chrome/browser/browser_prefs.cc | |
| parent | e74d4e35ec4d0d235f1aa08846e36b1e96ad0327 (diff) | |
| download | chromium_src-e94980027dc5cd1fb34950cddc18c629328a7e5b.zip chromium_src-e94980027dc5cd1fb34950cddc18c629328a7e5b.tar.gz chromium_src-e94980027dc5cd1fb34950cddc18c629328a7e5b.tar.bz2 | |
first stab at scaffolding WebContents.
Review URL: http://codereview.chromium.org/19757
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9055 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_prefs.cc')
| -rw-r--r-- | chrome/browser/browser_prefs.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/browser_prefs.cc b/chrome/browser/browser_prefs.cc index da18c3f..faf0408 100644 --- a/chrome/browser/browser_prefs.cc +++ b/chrome/browser/browser_prefs.cc @@ -5,8 +5,9 @@ #include "chrome/browser/browser_prefs.h" #include "chrome/browser/browser.h" -#include "chrome/browser/session_startup_pref.h" #include "chrome/browser/google_url_tracker.h" +#include "chrome/browser/session_startup_pref.h" +#include "chrome/browser/tab_contents/web_contents.h" #if defined(OS_WIN) #include "chrome/browser/browser_shutdown.h" @@ -28,7 +29,6 @@ #include "chrome/browser/views/frame/browser_view.h" #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 { @@ -36,9 +36,9 @@ namespace browser { void RegisterAllPrefs(PrefService* user_prefs, PrefService* local_state) { // Prefs in Local State GoogleURLTracker::RegisterPrefs(local_state); + Browser::RegisterPrefs(local_state); #if defined(OS_WIN) BookmarkManagerView::RegisterPrefs(local_state); - Browser::RegisterPrefs(local_state); BrowserView::RegisterBrowserViewPrefs(local_state); browser_shutdown::RegisterPrefs(local_state); CacheManagerHost::RegisterPrefs(local_state); @@ -54,18 +54,18 @@ void RegisterAllPrefs(PrefService* user_prefs, PrefService* local_state) { // User prefs SessionStartupPref::RegisterUserPrefs(user_prefs); + Browser::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); SSLManager::RegisterUserPrefs(user_prefs); TabContents::RegisterUserPrefs(user_prefs); TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); - WebContents::RegisterUserPrefs(user_prefs); #endif + WebContents::RegisterUserPrefs(user_prefs); } } // namespace browser |