Bookmark disappear first when closing browser

chrome/browser/ui/views/frame/browser_view.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/frame/browser_view.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 2152 matching lines @@
 BrowserViewLayout* BrowserView::GetBrowserViewLayout() const {
   return static_cast<BrowserViewLayout*>(GetLayoutManager());
 }
 
 ContentsLayoutManager* BrowserView::GetContentsLayoutManager() const {
   return static_cast<ContentsLayoutManager*>(
       contents_container_->GetLayoutManager());
 }
 
 bool BrowserView::MaybeShowBookmarkBar(WebContents* contents) {
   bool show_bookmark_bar = contents &&

[sky, 2017/06/26 15:28:34]

I liked your earlier fix better. This code need not depend upon contents, so I
prefer removing this conditional.

       browser_->SupportsWindowFeature(Browser::FEATURE_BOOKMARKBAR);
   if (!show_bookmark_bar && !bookmark_bar_view_.get())
     return false;
   if (!bookmark_bar_view_.get()) {
     bookmark_bar_view_.reset(new BookmarkBarView(browser_.get(), this));
     bookmark_bar_view_->set_owned_by_client();
     bookmark_bar_view_->SetBackground(
         base::MakeUnique<BookmarkBarViewBackground>(this,
                                                     bookmark_bar_view_.get()));
     bookmark_bar_view_->SetBookmarkBarState(
         browser_->bookmark_bar_state(),
         BookmarkBar::DONT_ANIMATE_STATE_CHANGE);
     GetBrowserViewLayout()->set_bookmark_bar(bookmark_bar_view_.get());
   }
   // Don't change the visibility of the BookmarkBarView. BrowserViewLayout
   // handles it.
   bookmark_bar_view_->SetPageNavigator(GetActiveWebContents());
 
   // Update parenting for the bookmark bar. This may detach it from all views.
   bool needs_layout = false;
   views::View* new_parent = nullptr;
   if (show_bookmark_bar) {
     if (bookmark_bar_view_->IsDetached())
       new_parent = this;
     else
       new_parent = top_container_;
   }
-  if (new_parent != bookmark_bar_view_->parent()) {
+  if (new_parent != nullptr && new_parent != bookmark_bar_view_->parent()) {
     SetBookmarkBarParent(new_parent);
     needs_layout = true;
   }
 
   // Check for updates to the desired size.
   if (bookmark_bar_view_->GetPreferredSize().height() !=
       bookmark_bar_view_->height())
     needs_layout = true;
 
   return needs_layout;
@@ skipping 445 matching lines @@
 }
 
 extensions::ActiveTabPermissionGranter*
 BrowserView::GetActiveTabPermissionGranter() {
   content::WebContents* web_contents = GetActiveWebContents();
   if (!web_contents)
     return nullptr;
   return extensions::TabHelper::FromWebContents(web_contents)
       ->active_tab_permission_granter();
 }