summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-08 23:57:38 +0000
committersky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-08 23:57:38 +0000
commit45c6af27a2c6d95c72a8908472460aa244a9051c (patch)
tree8cc9738cff6bd2ad94480c4bbe8e51491e9536c8
parent6cae00de1ed2173ce1f3a1254e093271001273af (diff)
downloadchromium_src-45c6af27a2c6d95c72a8908472460aa244a9051c.zip
chromium_src-45c6af27a2c6d95c72a8908472460aa244a9051c.tar.gz
chromium_src-45c6af27a2c6d95c72a8908472460aa244a9051c.tar.bz2
Removes a bogus DCHECK. This DCHECK is bogus for two reasons:
. it's checking a field that hasn't been set yet, hence the sporadic failure. . It shouldn't check delegate either as inside this class it's possible to supply NULL. I've removed it entirely and added a comment. BUG=5914 TEST=right click on the tab strip and make sure you don't get a DCHECK. Because this relies on random data, it's too hard to write a test for this, additionally I'm sure once we run the interactive ui tests under Purify this'll be covered. Review URL: http://codereview.chromium.org/17439 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7777 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/views/chrome_menu.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/views/chrome_menu.cc b/chrome/views/chrome_menu.cc
index 6b1483c..10b1894 100644
--- a/chrome/views/chrome_menu.cc
+++ b/chrome/views/chrome_menu.cc
@@ -1078,7 +1078,8 @@ const int MenuItemView::kMenuItemViewID = 1001;
bool MenuItemView::allow_task_nesting_during_run_ = false;
MenuItemView::MenuItemView(MenuDelegate* delegate) {
- DCHECK(delegate_);
+ // NOTE: don't check the delegate for NULL, UpdateMenuPartSizes supplies a
+ // NULL delegate.
Init(NULL, 0, SUBMENU, delegate);
}