Fixes regression where bookmark bar would appear all black. Actually,...

chrome/browser/views/frame/browser_view.cc

 // Copyright (c) 2006-2008 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 "base/command_line.h"
 
 #include "chrome/browser/views/frame/browser_view.h"
 
 #include "base/file_version_info.h"
 #include "base/time.h"
@@ skipping 177 matching lines @@
       contents_container_(NULL),
       initialized_(false),
       fullscreen_(false),
       can_drop_(false),
       hung_window_detector_(&hung_plugin_action_),
       ticker_(0),
 #ifdef CHROME_PERSONALIZATION
       personalization_enabled_(false),
       personalization_(NULL),
 #endif
-      forwarding_to_tab_strip_(false),
-      is_removing_bookmark_bar_(false) {
+      forwarding_to_tab_strip_(false) {
   InitClass();
   browser_->tabstrip_model()->AddObserver(this);
 }
 
 BrowserView::~BrowserView() {
   browser_->tabstrip_model()->RemoveObserver(this);
 
   // Stop hung plugin monitoring.
   ticker_.Stop();
   ticker_.UnregisterTickHandler(&hung_window_detector_);
@@ skipping 484 matching lines @@
 void BrowserView::DestroyBrowser() {
   // Explicitly delete the BookmarkBarView now. That way we don't have to
   // worry about the BookmarkBarView potentially outliving the Browser &
   // Profile.
   bookmark_bar_view_.reset();
   browser_.reset();
 }
 
 bool BrowserView::IsBookmarkBarVisible() const {
   return SupportsWindowFeature(FEATURE_BOOKMARKBAR) &&
-      bookmark_bar_view_.get() &&
-      (bookmark_bar_view_->GetPreferredSize().height() != 0);
+      active_bookmark_bar_ &&
+      (active_bookmark_bar_->GetPreferredSize().height() != 0);
 }
 
 gfx::Rect BrowserView::GetRootWindowResizerRect() const {
   // There is no resize corner when we are maximized
   if (IsMaximized())
     return gfx::Rect();
 
   // We don't specify a resize corner size if we have a bottom shelf either.
   // This is because we take care of drawing the resize corner on top of that
   // shelf, so we don't want others to do it for us in this case.
@@ skipping 631 matching lines @@
   int y = top -
       ((visible && IsTabStripVisible()) ? kToolbarTabStripVerticalOverlap : 0);
   int height = visible ? toolbar_->GetPreferredSize().height() : 0;
   toolbar_->SetVisible(visible);
   toolbar_->SetBounds(0, y, browser_view_width, height);
   return y + height;
 }
 
 int BrowserView::LayoutBookmarkAndInfoBars(int top) {
   find_bar_y_ = top + y() - 1;
-  if (bookmark_bar_view_.get()) {
+  if (active_bookmark_bar_) {
     // If we're showing the Bookmark bar in detached style, then we need to show
     // any Info bar _above_ the Bookmark bar, since the Bookmark bar is styled
     // to look like it's part of the page.
     if (bookmark_bar_view_->IsDetachedStyle())
       return LayoutBookmarkBar(LayoutInfoBar(top));
     // Otherwise, Bookmark bar first, Info bar second.
     top = LayoutBookmarkBar(top);
   }
   find_bar_y_ = top + y() - 1;
   return LayoutInfoBar(top);
 }
 
 int BrowserView::LayoutBookmarkBar(int top) {
-  DCHECK(bookmark_bar_view_.get());
+  DCHECK(active_bookmark_bar_);
   bool visible = IsBookmarkBarVisible();
   int height, y = top;
   if (visible) {
     y -= kSeparationLineHeight + (bookmark_bar_view_->IsDetachedStyle() ?
         0 : bookmark_bar_view_->GetToolbarOverlap());
     height = bookmark_bar_view_->GetPreferredSize().height();
   } else {
     height = 0;
   }
   bookmark_bar_view_->SetVisible(visible);
@@ skipping 33 matching lines @@
   int overlap = kStatusBubbleOverlap +
       (IsMaximized() ? 0 : views::NonClientView::kClientEdgeThickness);
   gfx::Point origin(-overlap, top - kStatusBubbleHeight + overlap);
   ConvertPointToView(this, GetParent(), &origin);
   status_bubble_->SetBounds(origin.x(), origin.y(), width() / 3,
                             kStatusBubbleHeight);
 }
 
 bool BrowserView::MaybeShowBookmarkBar(TabContents* contents) {
   views::View* new_bookmark_bar_view = NULL;
-  views::View* old_bookmark_bar_view = bookmark_bar_view_.get();
   if (SupportsWindowFeature(FEATURE_BOOKMARKBAR) && contents) {
-    if (!old_bookmark_bar_view) {
+    if (!bookmark_bar_view_.get()) {
       bookmark_bar_view_.reset(new BookmarkBarView(contents->profile(),
                                                    browser_.get()));
       bookmark_bar_view_->SetParentOwned(false);
     } else {
       bookmark_bar_view_->SetProfile(contents->profile());
     }
     bookmark_bar_view_->SetPageNavigator(contents);
     new_bookmark_bar_view = bookmark_bar_view_.get();
   }
-  is_removing_bookmark_bar_ = true;
-  bool result = UpdateChildViewAndLayout(new_bookmark_bar_view,
-                                         &old_bookmark_bar_view);
-  is_removing_bookmark_bar_ = false;
-  return result;
+  return UpdateChildViewAndLayout(new_bookmark_bar_view, &active_bookmark_bar_);
 }
 
 bool BrowserView::MaybeShowInfoBar(TabContents* contents) {
   // TODO(beng): Remove this function once the interface between
   //             InfoBarContainer, DownloadShelfView and TabContents and this
   //             view is sorted out.
   return true;
 }
 
 bool BrowserView::MaybeShowDownloadShelf(TabContents* contents) {
@@ skipping 204 matching lines @@
 
 // static
 void BrowserView::InitClass() {
   static bool initialized = false;
   if (!initialized) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     default_favicon_ = *rb.GetBitmapNamed(IDR_DEFAULT_FAVICON);
     initialized = true;
   }
 }