Fixes bug in bookmark bar view if profile changed. If the profile

chrome/browser/views/bookmark_bar_view.h

 // Copyright (c) 2010 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_BOOKMARK_BAR_VIEW_H_
 #define CHROME_BROWSER_VIEWS_BOOKMARK_BAR_VIEW_H_
 
 #include <set>
 
 #include "app/slide_animation.h"
@@ skipping 32 matching lines @@
                         public views::ButtonListener,
                         public NotificationObserver,
                         public views::ContextMenuController,
                         public views::DragController,
                         public AnimationDelegate,
                         public BookmarkMenuController::Observer,
                         public BookmarkBarInstructionsView::Delegate {
   friend class ShowFolderMenuTask;
 
  public:
+  // Constants used in Browser View, as well as here.
+  // How inset the bookmarks bar is when displayed on the new tab page.
+  static const int kNewtabHorizontalPadding;
+  static const int kNewtabVerticalPadding;
+
+  // Maximum size of buttons on the bookmark bar.
+  static const int kMaxButtonWidth;
+
   // Interface implemented by controllers/views that need to be notified any
   // time the model changes, typically to cancel an operation that is showing
   // data from the model such as a menu. This isn't intended as a general
   // way to be notified of changes, rather for cases where a controller/view is
   // showing data from the model in a modal like setting and needs to cleanly
   // exit the modal loop if the model changes out from under it.
   //
   // A controller/view that needs this notification should install itself as the
   // ModelChangeListener via the SetModelChangedListener method when shown and
   // reset the ModelChangeListener of the BookmarkBarView when it closes by way
@@ skipping 143 matching lines @@
   // Returns the position to anchor the menu for |button| at, the index of the
   // first child of the node to build the menu from.
   void GetAnchorPositionAndStartIndexForButton(
       views::MenuButton* button,
       views::MenuItemView::AnchorPosition* anchor,
       int* start_index);
 
   // BookmarkBarInstructionsView::Delegate.
   virtual void ShowImportDialog();
 
-  // Maximum size of buttons on the bookmark bar.
-  static const int kMaxButtonWidth;
-
   // If a button is currently throbbing, it is stopped. If immediate is true
   // the throb stops immediately, otherwise it stops after a couple more
   // throbs.
   void StopThrobbing(bool immediate);
 
+  // Returns the number of buttons corresponding to starred urls/groups. This
+  // is equivalent to the number of children the bookmark bar node from the
+  // bookmark bar model has.
+  int GetBookmarkButtonCount();
+
   // If true we're running tests. This short circuits a couple of animations.
   static bool testing_;
 
-  // Constants used in Browser View, as well as here.
-  // How inset the bookmarks bar is when displayed on the new tab page.
-  static const int kNewtabHorizontalPadding;
-  static const int kNewtabVerticalPadding;
-
  private:
   class ButtonSeparatorView;
   struct DropInfo;
 
   // Task that invokes ShowDropFolderForNode when run. ShowFolderDropMenuTask
   // deletes itself once run.
   class ShowFolderDropMenuTask : public Task {
    public:
     ShowFolderDropMenuTask(BookmarkBarView* view, const BookmarkNode* node)
       : view_(view),
@@ skipping 23 matching lines @@
   // Creates recent bookmark button and when visible button as well as
   // calculating the preferred height.
   void Init();
 
   // Creates the button showing the other bookmarked items.
   views::MenuButton* CreateOtherBookmarkedButton();
 
   // Creates the button used when not all bookmark buttons fit.
   views::MenuButton* CreateOverflowButton();
 
-  // Returns the number of buttons corresponding to starred urls/groups. This
-  // is equivalent to the number of children the bookmark bar node from the
-  // bookmark bar model has.
-  int GetBookmarkButtonCount();
-
   // Invoked when the bookmark bar model has finished loading. Creates a button
   // for each of the children of the root node from the model.
   virtual void Loaded(BookmarkModel* model);
 
   // Invoked when the model is being deleted.
   virtual void BookmarkModelBeingDeleted(BookmarkModel* model);
 
   // Invokes added followed by removed.
   virtual void BookmarkNodeMoved(BookmarkModel* model,
                                  const BookmarkNode* old_parent,
@@ skipping 202 matching lines @@
   // overflow_button_ or a button on the bar.
   views::CustomButton* throbbing_view_;
 
   // Background for extension toolstrips.
   SkBitmap toolstrip_background_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkBarView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_BOOKMARK_BAR_VIEW_H_