summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/bookmark_bar_view.cc
diff options
context:
space:
mode:
authorsky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-26 23:37:10 +0000
committersky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-26 23:37:10 +0000
commit98e0949f24b56b62f161ff7f694cedde17564b80 (patch)
tree664e610d2941eb11cb13bb0c229b3b464a3280c3 /chrome/browser/views/bookmark_bar_view.cc
parent37eeb5a01e5ca3233934628c635d866999e329a6 (diff)
downloadchromium_src-98e0949f24b56b62f161ff7f694cedde17564b80.zip
chromium_src-98e0949f24b56b62f161ff7f694cedde17564b80.tar.gz
chromium_src-98e0949f24b56b62f161ff7f694cedde17564b80.tar.bz2
Fixes regression where bookmark bar would appear all black. Actually,
it wasn't that the bookmark bar was all black, rather that BrowserView thought the bookmark bar was parented when in fact it wasn't. The black was the result of BrowserView reserving the space for the bookmark bar and not painting anything in it's space. BUG=7922 TEST=see bug Review URL: http://codereview.chromium.org/28191 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10530 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/bookmark_bar_view.cc')
-rw-r--r--chrome/browser/views/bookmark_bar_view.cc5
1 files changed, 0 insertions, 5 deletions
diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc
index 40f603e..400b7ab 100644
--- a/chrome/browser/views/bookmark_bar_view.cc
+++ b/chrome/browser/views/bookmark_bar_view.cc
@@ -871,11 +871,6 @@ void BookmarkBarView::DidChangeBounds(const gfx::Rect& previous,
void BookmarkBarView::ViewHierarchyChanged(bool is_add,
View* parent,
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(testing_ || child != this || is_add ||
- static_cast<BrowserView*>(parent)->is_removing_bookmark_bar());
-
if (is_add && child == this && height() > 0) {
// We only layout while parented. When we become parented, if our bounds
// haven't changed, DidChangeBounds won't get invoked and we won't layout.