Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(514)

Unified Diff: chrome/browser/browser_prefs.cc

Issue 115149: Implement the popup blocking whitelist pref. This makes the whitelist actual... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/browser_prefs.cc
===================================================================
--- chrome/browser/browser_prefs.cc (revision 15654)
+++ chrome/browser/browser_prefs.cc (working copy)
@@ -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 @@
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

Powered by Google App Engine
This is Rietveld 408576698