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 2161 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/20 16:35:06]

I think the bug is here. We should show the bookmarkbar if there is no contents
(which only happens during startup/shutudown).

[weidongg, 2017/06/20 19:51:50]

Aha I see, so I could change it to:
"bool show_bookmark_bar = 
browser_->SupportsWindowFeature(Browser::FEATURE_BOOKMARKBAR);"

       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(
@@ skipping 47 matching lines @@
     // of it will ensure it's drawn before the toolbar.
     AddChildViewAt(bookmark_bar_view_.get(), top_container_index);
   } else if (new_parent == top_container_) {
     // BookmarkBarView is attached.
 
     // The toolbar is a child of |top_container_|, so making the bookmark bar
     // the first child ensures it's drawn before the toolbar.
     new_parent->AddChildViewAt(bookmark_bar_view_.get(), 0);
   } else {
     DCHECK(!new_parent);
-    // Bookmark bar is being detached from all views because it is hidden.
-    bookmark_bar_view_->parent()->RemoveChildView(bookmark_bar_view_.get());
+    if (bookmark_bar_view_->get_bookmark_bar_state() ==
+        BookmarkBar::State::HIDDEN) {
+      // Bookmark bar is being detached from all views if it is hidden.
+      bookmark_bar_view_->parent()->RemoveChildView(bookmark_bar_view_.get());
+    }
   }
 }
 
 bool BrowserView::MaybeShowInfoBar(WebContents* contents) {
   // TODO(beng): Remove this function once the interface between
   //             InfoBarContainer, DownloadShelfView and WebContents and this
   //             view is sorted out.
   return true;
 }
 
@@ skipping 404 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();
 }