Cleanup BrowserActionsContainer a bit

chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.h

 // Copyright (c) 2012 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_EXTENSIONS_BROWSER_ACTION_OVERFLOW_MENU_CONTROLLER_H_
 #define CHROME_BROWSER_UI_VIEWS_EXTENSIONS_BROWSER_ACTION_OVERFLOW_MENU_CONTROLLER_H_
 
 #include <set>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/sequenced_task_runner_helpers.h"
 #include "ui/views/controls/menu/menu_delegate.h"
 
 class Browser;
 class BrowserActionsContainer;
 class BrowserActionView;
-
 class IconUpdater;
 
 namespace views {
 class MenuRunner;
 class Widget;
 }
 
 // This class handles the overflow menu for browser actions (showing the menu,
 // drag and drop, etc). This class manages its own lifetime.
 class BrowserActionOverflowMenuController : public views::MenuDelegate {
@@ skipping 51 matching lines @@
   // overflow menu.
   virtual bool CanDrag(views::MenuItemView* menu) OVERRIDE;
   virtual void WriteDragData(views::MenuItemView* sender,
                              ui::OSExchangeData* data) OVERRIDE;
   virtual int GetDragOperations(views::MenuItemView* sender) OVERRIDE;
 
  private:
   // This class manages its own lifetime.
   virtual ~BrowserActionOverflowMenuController();
 
-  // Converts a menu item |id| into a BrowserActionView by adding the |id| value
-  // to the number of visible views (according to the container owner). If
-  // |index| is specified, it will point to the absolute index of the view.
-  BrowserActionView* ViewForId(int id, size_t* index);
+  // Returns the offset into |views_| for the given |id|.
+  size_t IndexForId(int id) const;
 
   // A pointer to the browser action container that owns the overflow menu.
   BrowserActionsContainer* owner_;
 
   Browser* browser_;
 
   // The observer, may be null.
   Observer* observer_;
 
   // A pointer to the overflow menu button that we are showing the menu for.
   views::MenuButton* menu_button_;
 
   // The overflow menu for the menu button. Owned by |menu_runner_|.
   views::MenuItemView* menu_;
 
   // Resposible for running the menu.
   scoped_ptr<views::MenuRunner> menu_runner_;
 
   // The views vector of all the browser actions the container knows about. We
   // won't show all items, just the one starting at |start_index| and above.
-  const std::vector<BrowserActionView*>* views_;
+  // Owned by |owner_|.
+  const std::vector<BrowserActionView*>& views_;
 
   // The index into the BrowserActionView vector, indicating where to start
   // picking browser actions to draw.
   int start_index_;
 
   // Whether this controller is being used for drop.
   bool for_drop_;
 
   // The vector keeps all icon updaters associated with menu item views in the
   // controller. The icon updater will update the menu item view's icon when
   // the browser action view's icon has been updated.
   ScopedVector<IconUpdater> icon_updaters_;
 
   friend class base::DeleteHelper<BrowserActionOverflowMenuController>;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserActionOverflowMenuController);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_EXTENSIONS_BROWSER_ACTION_OVERFLOW_MENU_CONTROLLER_H_