| Index: chrome/browser/views/bookmark_bar_view.cc
|
| ===================================================================
|
| --- chrome/browser/views/bookmark_bar_view.cc (revision 10292)
|
| +++ chrome/browser/views/bookmark_bar_view.cc (working copy)
|
| @@ -24,6 +24,7 @@
|
| #include "chrome/browser/view_ids.h"
|
| #include "chrome/browser/views/bookmark_editor_view.h"
|
| #include "chrome/browser/views/event_utils.h"
|
| +#include "chrome/browser/views/frame/browser_view.h"
|
| #include "chrome/browser/views/input_window.h"
|
| #include "chrome/common/gfx/chrome_canvas.h"
|
| #include "chrome/common/gfx/favicon_size.h"
|
| @@ -868,7 +869,13 @@
|
| }
|
|
|
| void BookmarkBarView::ViewHierarchyChanged(bool is_add,
|
| - View* parent, View* child) {
|
| + 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(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.
|
|
|