diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-09 00:33:04 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-09 00:33:04 +0000 |
| commit | e7f5c6f8aede399fe896e8218d89087408011d18 (patch) | |
| tree | 58ed75a2b1ae424a089a9a9fd8bb5724fed35ded /chrome/browser/browser_prefs.cc | |
| parent | 1188a6c0b9025c6ccb9eff833599b951fc778a9a (diff) | |
| download | chromium_src-e7f5c6f8aede399fe896e8218d89087408011d18.zip chromium_src-e7f5c6f8aede399fe896e8218d89087408011d18.tar.gz chromium_src-e7f5c6f8aede399fe896e8218d89087408011d18.tar.bz2 | |
Implement the popup blocking whitelist pref. This makes the whitelist actually function.BUG=11440
Review URL: http://codereview.chromium.org/115149
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15702 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_prefs.cc')
| -rw-r--r-- | chrome/browser/browser_prefs.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/browser_prefs.cc b/chrome/browser/browser_prefs.cc index fce04ae..014c7b6 100644 --- a/chrome/browser/browser_prefs.cc +++ b/chrome/browser/browser_prefs.cc @@ -25,6 +25,7 @@ #if defined(OS_WIN) // TODO(port): whittle this down as we port #include "chrome/browser/task_manager.h" +#include "chrome/browser/views/blocked_popup_container.h" #include "chrome/browser/views/bookmark_manager_view.h" #include "chrome/browser/views/frame/browser_view.h" #include "chrome/browser/views/keyword_editor_view.h" @@ -63,6 +64,9 @@ void RegisterAllPrefs(PrefService* user_prefs, PrefService* local_state) { TabContents::RegisterUserPrefs(user_prefs); TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); NewTabUI::RegisterUserPrefs(user_prefs); +#if defined(OS_WIN) // TODO(port): whittle this down as we port + BlockedPopupContainer::RegisterUserPrefs(user_prefs); +#endif } } // namespace browser |