summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_prefs.cc
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-11 22:03:15 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-11 22:03:15 +0000
commitc6e6700f0ad9075d6ef675dd4de0626570929000 (patch)
tree10621884ce2a81d52326ac3d8e32cc1063b88895 /chrome/browser/browser_prefs.cc
parent83ec6d395d0b8a836370579368e1b365a3abbca4 (diff)
downloadchromium_src-c6e6700f0ad9075d6ef675dd4de0626570929000.zip
chromium_src-c6e6700f0ad9075d6ef675dd4de0626570929000.tar.gz
chromium_src-c6e6700f0ad9075d6ef675dd4de0626570929000.tar.bz2
Move the hang monitor to the BrowserView, since it's highly Windows/HWND specific.
http://crbug.com/4310 Review URL: http://codereview.chromium.org/10601 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5211 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_prefs.cc')
-rw-r--r--chrome/browser/browser_prefs.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/browser_prefs.cc b/chrome/browser/browser_prefs.cc
index 46deec6..e0256a4 100644
--- a/chrome/browser/browser_prefs.cc
+++ b/chrome/browser/browser_prefs.cc
@@ -23,6 +23,7 @@
#include "chrome/browser/views/bookmark_bar_view.h"
#include "chrome/browser/views/bookmark_manager_view.h"
#include "chrome/browser/views/bookmark_table_view.h"
+#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/web_contents.h"
@@ -33,6 +34,7 @@ void RegisterAllPrefs(PrefService* user_prefs, PrefService* local_state) {
// Prefs in Local State
BookmarkManagerView::RegisterPrefs(local_state);
Browser::RegisterPrefs(local_state);
+ BrowserView::RegisterBrowserViewPrefs(local_state);
CacheManagerHost::RegisterPrefs(local_state);
chrome_browser_net::RegisterPrefs(local_state);
GoogleURLTracker::RegisterPrefs(local_state);