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

chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.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_GTK_BOOKMARKS_BOOKMARK_BAR_GTK_H_
 #define CHROME_BROWSER_UI_GTK_BOOKMARKS_BOOKMARK_BAR_GTK_H_
 #pragma once
 
 #include <gtk/gtk.h>
 
@@ skipping 19 matching lines @@
 #include "ui/gfx/point.h"
 #include "ui/gfx/size.h"
 
 class BookmarkMenuController;
 class Browser;
 class BrowserWindowGtk;
 class CustomContainerButton;
 class GtkThemeService;
 class MenuGtk;
 class PageNavigator;
-class Profile;
 class TabstripOriginProvider;
 
 class BookmarkBarGtk : public ui::AnimationDelegate,
                        public ProfileSyncServiceObserver,
                        public BookmarkModelObserver,
                        public MenuBarHelper::Delegate,
                        public NotificationObserver,
                        public BookmarkBarInstructionsGtk::Delegate,
                        public BookmarkContextMenuControllerDelegate {
  public:
   // The NTP needs to have access to this.
   static const int kBookmarkBarNTPHeight;
 
   BookmarkBarGtk(BrowserWindowGtk* window,
-                 Profile* profile,
                  Browser* browser,
                  TabstripOriginProvider* tabstrip_origin_provider);
   virtual ~BookmarkBarGtk();
 
-  // Resets the profile. This removes any buttons for the current profile and
-  // recreates the models.
-  void SetProfile(Profile* profile);
-
-  // Returns the current profile.
-  Profile* GetProfile() { return profile_; }
-
   // Returns the current browser.
   Browser* browser() const { return browser_; }
 
   // Returns the top level widget.
   GtkWidget* widget() const { return event_box_.get(); }
 
   // Sets the PageNavigator that is used when the user selects an entry on
   // the bookmark bar.
   void SetPageNavigator(PageNavigator* navigator);
 
   // Create the contents of the bookmark bar.
-  void Init(Profile* profile);
+  void Init();
 
   // Changes the state of the bookmark bar.
   void SetBookmarkBarState(BookmarkBar::State state,
                            BookmarkBar::AnimateChangeType animate_type);
 
   // Get the current height of the bookmark bar.
   int GetHeight();
 
   // Returns true if the bookmark bar is showing an animation.
   bool IsAnimating();
@@ skipping 38 matching lines @@
   // any bookmarks in the bookmark bar node.
   void SetInstructionState();
 
   // Sets the visibility of the overflow chevron.
   void SetChevronState();
 
   // Shows or hides the other bookmarks button depending on whether there are
   // bookmarks in it.
   void UpdateOtherBookmarksVisibility();
 
-  // Helper function which destroys all the bookmark buttons in the GtkToolbar.
-  void RemoveAllBookmarkButtons();
+  // Destroys all the bookmark buttons in the GtkToolbar.
+  void RemoveAllButtons();
+
+  // Adds the "other bookmarks" and overflow buttons.
+  void AddCoreButtons();
+
+  // Removes and recreates all buttons in the bar.
+  void ResetButtons();
 
   // Returns the number of buttons corresponding to starred urls/folders. This
   // is equivalent to the number of children the bookmark bar node from the
   // bookmark bar model has.
   int GetBookmarkButtonCount();
 
   // Set the appearance of the overflow button appropriately (either chromium
   // style or GTK style).
   void SetOverflowButtonAppearance();
 
@@ skipping 146 matching lines @@
 
   // ProfileSyncServiceObserver method.
   virtual void OnStateChanged();
 
   // Overriden from BookmarkBarInstructionsGtk::Delegate.
   virtual void ShowImportDialog();
 
   // Updates the drag&drop state when |edit_bookmarks_enabled_| changes.
   void OnEditBookmarksEnabledChanged();
 
-  Profile* profile_;
-
   // Used for opening urls.
   PageNavigator* page_navigator_;
 
   Browser* browser_;
   BrowserWindowGtk* window_;
 
   // Provides us with the offset into the background theme image.
   TabstripOriginProvider* tabstrip_origin_provider_;
 
   // Model providing details as to the starred entries/folders that should be
@@ skipping 94 matching lines @@
   BooleanPrefMember edit_bookmarks_enabled_;
 
   ScopedRunnableMethodFactory<BookmarkBarGtk> method_factory_;
 
   BookmarkBar::State bookmark_bar_state_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkBarGtk);
 };
 
 #endif  // CHROME_BROWSER_UI_GTK_BOOKMARKS_BOOKMARK_BAR_GTK_H_