summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_prefs.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/browser_prefs.cc')
-rw-r--r--chrome/browser/browser_prefs.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/browser_prefs.cc b/chrome/browser/browser_prefs.cc
index faf0408..57bec82 100644
--- a/chrome/browser/browser_prefs.cc
+++ b/chrome/browser/browser_prefs.cc
@@ -5,11 +5,12 @@
#include "chrome/browser/browser_prefs.h"
#include "chrome/browser/browser.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/tab_contents/web_contents.h"
-#if defined(OS_WIN)
+#if defined(OS_WIN) // TODO(port): whittle this down as we port
#include "chrome/browser/browser_shutdown.h"
#include "chrome/browser/cache_manager_host.h"
#include "chrome/browser/net/dns_global.h"
@@ -22,7 +23,6 @@
#include "chrome/browser/spellchecker.h"
#include "chrome/browser/ssl/ssl_manager.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"
#include "chrome/browser/views/bookmark_manager_view.h"
#include "chrome/browser/views/bookmark_table_view.h"
@@ -37,7 +37,7 @@ void RegisterAllPrefs(PrefService* user_prefs, PrefService* local_state) {
// Prefs in Local State
GoogleURLTracker::RegisterPrefs(local_state);
Browser::RegisterPrefs(local_state);
-#if defined(OS_WIN)
+#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);
@@ -55,7 +55,7 @@ void RegisterAllPrefs(PrefService* user_prefs, PrefService* local_state) {
// User prefs
SessionStartupPref::RegisterUserPrefs(user_prefs);
Browser::RegisterUserPrefs(user_prefs);
-#if defined(OS_WIN)
+#if defined(OS_WIN) // TODO(port): whittle this down as we port
BookmarkBarView::RegisterUserPrefs(user_prefs);
BookmarkTableView::RegisterUserPrefs(user_prefs);
chrome_browser_net::RegisterUserPrefs(user_prefs);
@@ -63,8 +63,8 @@ void RegisterAllPrefs(PrefService* user_prefs, PrefService* local_state) {
PasswordManager::RegisterUserPrefs(user_prefs);
SSLManager::RegisterUserPrefs(user_prefs);
TabContents::RegisterUserPrefs(user_prefs);
- TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs);
#endif
+ TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs);
WebContents::RegisterUserPrefs(user_prefs);
}