Index: chrome/browser/browser_prefs.cc |
diff --git a/chrome/browser/browser_prefs.cc b/chrome/browser/browser_prefs.cc |
index ced36f5d2d283131f64d229c67615149c210e43e..b9e7fa259256f3ecd61ee8ff3afe6acb3e425e1f 100644 |
--- a/chrome/browser/browser_prefs.cc |
+++ b/chrome/browser/browser_prefs.cc |
@@ -31,19 +31,12 @@ |
#include "chrome/browser/session_startup_pref.h" |
#include "chrome/browser/ssl/ssl_manager.h" |
#include "chrome/browser/tab_contents/tab_contents.h" |
+#include "chrome/browser/task_manager.h" |
#if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port |
#include "chrome/browser/views/frame/browser_view.h" |
#endif |
-#if defined(OS_WIN) || defined(OS_LINUX) |
-#include "chrome/browser/task_manager.h" |
-#endif |
- |
-#if defined(OS_WIN) |
-#include "chrome/browser/views/keyword_editor_view.h" |
-#endif |
- |
#if defined(TOOLKIT_GTK) |
#include "chrome/browser/gtk/browser_window_gtk.h" |
#endif |
@@ -77,9 +70,7 @@ void RegisterLocalState(PrefService* local_state) { |
#if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port |
BrowserView::RegisterBrowserViewPrefs(local_state); |
#endif |
-#if defined(OS_WIN) || defined(OS_LINUX) |
TaskManager::RegisterPrefs(local_state); |
-#endif |
} |
void RegisterUserPrefs(PrefService* user_prefs) { |