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

chrome/browser/views/frame/browser_view.h

 // 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.
 
 #ifndef CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_
 #define CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_
 
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/hang_monitor/hung_plugin_action.h"
@@ skipping 243 matching lines @@
 #ifdef CHROME_PERSONALIZATION
   virtual bool IsPersonalizationEnabled() const {
     return personalization_enabled_;
   }
 
   void EnablePersonalization(bool enable_personalization) {
     personalization_enabled_ = enable_personalization;
   }
 #endif
 
-  bool is_removing_bookmark_bar() const { return is_removing_bookmark_bar_; }
-
  protected:
   // Overridden from views::View:
   virtual void Layout();
   virtual void ViewHierarchyChanged(bool is_add,
                                     views::View* parent,
                                     views::View* child);
   // As long as ShouldForwardToTabStrip returns true, drag and drop methods
   // are forwarded to the tab strip.
   virtual bool CanDrop(const OSExchangeData& data);
   virtual void OnDragEntered(const views::DropTargetEvent& event);
@@ skipping 96 matching lines @@
   // Initialize class statics.
   static void InitClass();
 
   // The BrowserFrame that hosts this view.
   BrowserFrame* frame_;
 
   // The Browser object we are associated with.
   scoped_ptr<Browser> browser_;
 
   // Tool/Info bars that we are currently showing. Used for layout.
+  // active_bookmark_bar_ is either NULL, if the bookmark bar isn't showing,
+  // or is bookmark_bar_view_ if the bookmark bar is showing.
   views::View* active_bookmark_bar_;
   views::View* active_download_shelf_;
 
   // The TabStrip.
   TabStrip* tabstrip_;
 
   // The Toolbar containing the navigation buttons, menus and the address bar.
   BrowserToolbarView* toolbar_;
 
   // The Bookmark Bar View for this window. Lazily created.
@@ skipping 67 matching lines @@
 
   // The timer used to update frames for the Loading Animation.
   base::RepeatingTimer<BrowserView> loading_animation_timer_;
 
   // P13N stuff
 #ifdef CHROME_PERSONALIZATION
   FramePersonalization personalization_;
   bool personalization_enabled_;
 #endif
 
-  // For debugging 7857.
-  bool is_removing_bookmark_bar_;
-
   DISALLOW_COPY_AND_ASSIGN(BrowserView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_