diff options
| author | sky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-25 18:30:25 +0000 |
|---|---|---|
| committer | sky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-25 18:30:25 +0000 |
| commit | 57669d96db7dbba624c0d3af76debf7f7d4d5cf0 (patch) | |
| tree | a3fbef4df05718bf841f09d35283e377b03f1bde /chrome/browser/views/bookmark_bar_view.cc | |
| parent | f4f471dbff8d4fdcd91bf81bc02614862d8ccbf1 (diff) | |
| download | chromium_src-57669d96db7dbba624c0d3af76debf7f7d4d5cf0.zip chromium_src-57669d96db7dbba624c0d3af76debf7f7d4d5cf0.tar.gz chromium_src-57669d96db7dbba624c0d3af76debf7f7d4d5cf0.tar.bz2 | |
Fixes bogus DCHECK in bookmark_bar_view. I needed to add the check for
testing_ as we don't want it hit in the interactive tests, and the
check should be for removing, so that I wanted is_add, not !is_add.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/28122
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10353 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/bookmark_bar_view.cc')
| -rw-r--r-- | chrome/browser/views/bookmark_bar_view.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc index 4e11edd..40f603e 100644 --- a/chrome/browser/views/bookmark_bar_view.cc +++ b/chrome/browser/views/bookmark_bar_view.cc @@ -873,7 +873,7 @@ void BookmarkBarView::ViewHierarchyChanged(bool is_add, View* child) { // See http://code.google.com/p/chromium/issues/detail?id=7857 . It seems // as though the bookmark bar is getting unintentionally removed. - DCHECK(child != this || !is_add || + DCHECK(testing_ || child != this || is_add || static_cast<BrowserView*>(parent)->is_removing_bookmark_bar()); if (is_add && child == this && height() > 0) { |