Fix the current remaining Views-GTK compile and linker errors.

Chrome still doesn't run.

Review URL: http://codereview.chromium.org/155026

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19977 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/browser_prefs.cc b/chrome/browser/browser_prefs.cc
index 6d5c1f1e..84753d9 100755
--- a/chrome/browser/browser_prefs.cc
+++ b/chrome/browser/browser_prefs.cc
@@ -26,9 +26,12 @@
 #include "chrome/browser/ssl/ssl_manager.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 
-#if defined(OS_WIN)  // TODO(port): whittle this down as we port
+#if defined(TOOLKIT_VIEWS)  // TODO(port): whittle this down as we port
 #include "chrome/browser/task_manager.h"
 #include "chrome/browser/views/frame/browser_view.h"
+#endif
+
+#if defined(OS_WIN)
 #include "chrome/browser/views/keyword_editor_view.h"
 #endif
 
@@ -47,7 +50,7 @@
   chrome_browser_net::RegisterPrefs(local_state);
   bookmark_utils::RegisterPrefs(local_state);
   PageInfoWindow::RegisterPrefs(local_state);
-#if defined(OS_WIN)  // TODO(port): whittle this down as we port
+#if defined(TOOLKIT_VIEWS)  // TODO(port): whittle this down as we port
   BrowserView::RegisterBrowserViewPrefs(local_state);
   TaskManager::RegisterPrefs(local_state);
 #endif