Clean up bits of the toolbar code....

chrome/browser/views/toolbar_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_TOOLBAR_VIEW_H_
 #define CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_
 
 #include <vector>
 
 #include "app/menus/simple_menu_model.h"
@@ skipping 123 matching lines @@
   virtual bool AcceleratorPressed(const views::Accelerator& accelerator);
   virtual gfx::Size GetPreferredSize();
   virtual void Layout();
   virtual void Paint(gfx::Canvas* canvas);
   virtual void ThemeChanged();
 
  private:
   // Returns the number of pixels above the location bar in non-normal display.
   int PopupTopSpacing() const;
 
-  // Set up the various Views in the toolbar
-  void CreateLeftSideControls();
-  void CreateCenterStack(Profile* profile);
-  void CreateRightSideControls(Profile* profile);
-  void LoadLeftSideControlsImages();
-  void LoadCenterStackImages();
-  void LoadRightSideControlsImages();
+  // Loads the images for all the child views.
+  void LoadImages();
 
   // Runs various menus.
   void RunPageMenu(const gfx::Point& pt);
   void RunAppMenu(const gfx::Point& pt);
 
   // Check if the menu exited with a code indicating the user wants to
   // switch to the other menu, and then switch to that other menu.
   void SwitchToOtherMenuIfNeeded(views::Menu2* previous_menu,
                                  views::MenuButton* next_menu_button);
 
@@ skipping 98 matching lines @@
   // running.
   bool* destroyed_flag_;
 
   // When collapsed, the toolbar is just a tiny strip, no controls are visible.
   bool collapsed_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_