Remove frontend code that allows for dynamic profile setting, and read the profile off the browse...

chrome/browser/ui/views/bookmarks/bookmark_bar_view.h

 // Copyright (c) 2011 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_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_
 #pragma once
 
 #include <set>
 
@@ skipping 52 matching lines @@
   static const char kViewClassName[];
 
   // 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;
 
-  BookmarkBarView(Profile* profile, Browser* browser);
+  explicit BookmarkBarView(Browser* browser);
   virtual ~BookmarkBarView();
 
-  // Resets the profile. This removes any buttons for the current profile and
-  // recreates the models.
-  void SetProfile(Profile* profile);
-
   // Returns the current browser.
   Browser* browser() const { return browser_; }
 
   // Sets the PageNavigator that is used when the user selects an entry on
   // the bookmark bar.
   void SetPageNavigator(PageNavigator* navigator);
 
   // Sets whether the containing browser is showing an infobar.  This affects
   // layout during animation.
   void set_infobar_visible(bool infobar_visible) {
@@ skipping 265 matching lines @@
   void UpdateOtherBookmarksVisibility();
 
   // This method computes the bounds for the bookmark bar items. If
   // |compute_bounds_only| = TRUE, the bounds for the items are just computed,
   // but are not set. This mode is used by GetPreferredSize() to obtain the
   // desired bounds. If |compute_bounds_only| = FALSE, the bounds are set.
   gfx::Size LayoutItems(bool compute_bounds_only);
 
   NotificationRegistrar registrar_;
 
-  Profile* profile_;
-
   // Used for opening urls.
   PageNavigator* page_navigator_;
 
   // Model providing details as to the starred entries/folders that should be
   // shown. This is owned by the Profile.
   BookmarkModel* model_;
 
   // Used to manage showing a Menu, either for the most recently bookmarked
   // entries, or for the starred folder.
   BookmarkMenuController* bookmark_menu_;
@@ skipping 21 matching lines @@
 
   // Visible if not all the bookmark buttons fit.
   views::MenuButton* overflow_button_;
 
   // BookmarkBarInstructionsView that is visible if there are no bookmarks on
   // the bookmark bar.
   views::View* instructions_;
 
   ButtonSeparatorView* bookmarks_separator_view_;
 
   // Owning browser. This is NULL during testing.

[sky, 2011/08/08 16:02:29]

Is the comment about NULL during testing applicable anymore?

[Peter Kasting, 2011/08/08 17:52:07]

No.

   Browser* browser_;
 
   // True if the owning browser is showing an infobar.
   bool infobar_visible_;
 
   // Animation controlling showing and hiding of the bar.
   scoped_ptr<ui::SlideAnimation> size_animation_;
 
   // If the bookmark bubble is showing, this is the visible ancestor of the URL.
   // The visible ancestor is either the other_bookmarked_button_,
   // overflow_button_ or a button on the bar.
   views::CustomButton* throbbing_view_;
 
   BookmarkBar::State bookmark_bar_state_;
 
   // Are we animating to or from the detached state?
   bool animating_detached_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkBarView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_