diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-05 20:51:35 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-05 20:51:35 +0000 |
| commit | 5f40e11c2b4187e9bfc0f3592c86afb587d00d09 (patch) | |
| tree | e3b2f81eaa0f54a590f1bc0f5e44c0b1ba51e607 /chrome | |
| parent | 27a148e3eb55a132e7c763df2c6fef94ac54df04 (diff) | |
| download | chromium_src-5f40e11c2b4187e9bfc0f3592c86afb587d00d09.zip chromium_src-5f40e11c2b4187e9bfc0f3592c86afb587d00d09.tar.gz chromium_src-5f40e11c2b4187e9bfc0f3592c86afb587d00d09.tar.bz2 | |
Fix disabled DCHECK by giving kImpossibleNumberOfPopups real storage.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/259050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28037 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/blocked_popup_container.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/blocked_popup_container.h | 2 | ||||
| -rw-r--r-- | chrome/browser/gtk/blocked_popup_container_view_gtk.cc | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/blocked_popup_container.cc b/chrome/browser/blocked_popup_container.cc index 4744fb5..2422c2b 100644 --- a/chrome/browser/blocked_popup_container.cc +++ b/chrome/browser/blocked_popup_container.cc @@ -11,6 +11,9 @@ #include "chrome/common/notification_service.h" // static +const size_t BlockedPopupContainer::kImpossibleNumberOfPopups = 30; + +// static BlockedPopupContainer* BlockedPopupContainer::Create( TabContents* owner, Profile* profile) { BlockedPopupContainer* container = diff --git a/chrome/browser/blocked_popup_container.h b/chrome/browser/blocked_popup_container.h index 7eb6192..781def3 100644 --- a/chrome/browser/blocked_popup_container.h +++ b/chrome/browser/blocked_popup_container.h @@ -199,7 +199,7 @@ class BlockedPopupContainer : public TabContentsDelegate, // A number larger than the internal popup count on the Renderer; meant for // preventing a compromised renderer from exhausting GDI memory by spawning // infinite windows. - static const size_t kImpossibleNumberOfPopups = 30; + static const size_t kImpossibleNumberOfPopups; protected: struct BlockedPopup { diff --git a/chrome/browser/gtk/blocked_popup_container_view_gtk.cc b/chrome/browser/gtk/blocked_popup_container_view_gtk.cc index f5397ce..fa3979e 100644 --- a/chrome/browser/gtk/blocked_popup_container_view_gtk.cc +++ b/chrome/browser/gtk/blocked_popup_container_view_gtk.cc @@ -153,7 +153,7 @@ void BlockedPopupContainerViewGtk::ExecuteCommand(int id) { // |id| shouldn't be == kImpossibleNumberOfPopups since the popups end before // this and the hosts start after it. (If it is used, it is as a separator.) - //DCHECK_NE(id_size_t, BlockedPopupContainer::kImpossibleNumberOfPopups); + DCHECK_NE(id_size_t, BlockedPopupContainer::kImpossibleNumberOfPopups); id_size_t -= BlockedPopupContainer::kImpossibleNumberOfPopups + 1; // Is this a click on a host? |