Begin to upgrade BackForwardMenuModelViews to use new menu API....

chrome/browser/back_forward_menu_model.h

 // Copyright (c) 2006-2008 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_BACK_FORWARD_MENU_MODEL_H_
 #define CHROME_BROWSER_BACK_FORWARD_MENU_MODEL_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 
 class Browser;
 class SkBitmap;
 class TabContents;
 class NavigationEntry;
 
 ///////////////////////////////////////////////////////////////////////////////
 //
 // BackForwardMenuModel
 //
 // Interface for the showing of the dropdown menu for the Back/Forward buttons.
 // Actual implementations are platform-specific.
 ///////////////////////////////////////////////////////////////////////////////
 class BackForwardMenuModel {
  public:
   // These are IDs used to identify individual UI elements within the
   // browser window using View::GetViewByID.
   enum ModelType {
-    FORWARD_MENU_DELEGATE = 1,
-    BACKWARD_MENU_DELEGATE = 2
+    FORWARD_MENU = 1,
+    BACKWARD_MENU = 2
   };
 
-  // Factory function. Defined in back_forward_menu_model_{platform}.cc.
-  // This is only used in unit tests. In the browser we use the platform-
-  // specific constructors directly.
-  static BackForwardMenuModel* Create(Browser* browser, ModelType model_type);
-
+  BackForwardMenuModel(Browser* browser, ModelType model_type);
   virtual ~BackForwardMenuModel() { }
 
   // Returns how many history items the menu should show. For example, if the
   // navigation controller of the current tab has a current entry index of 5 and
   // forward_direction_ is false (we are the back button delegate) then this
   // function will return 5 (representing 0-4). If forward_direction_ is
   // true (we are the forward button delegate), then this function will return
   // the number of entries after 5. Note, though, that in either case it will
   // not report more than kMaxHistoryItems. The number returned also does not
   // include the separator line after the history items (nor the separator for
@@ skipping 53 matching lines @@
   // Get the display icon for the item. This should not be called on a
   // separator or an item that does not have an icon.
   const SkBitmap& GetItemIcon(int menu_id) const;
 
   // Returns true if there is an icon for this menu item.
   bool ItemHasIcon(int menu_id) const;
 
   // Does the item does something when you click on it?
   bool ItemHasCommand(int menu_id) const;
 
+#ifdef UNIT_TEST
   // Allows the unit test to use its own dummy tab contents.
   void set_test_tab_contents(TabContents* test_tab_contents) {
     test_tab_contents_ = test_tab_contents;
   }
+#endif
 
   // Allow the unit test to use the "Show Full History" label.
   std::wstring GetShowFullHistoryLabel() const;
 
   // Retrieves the TabContents pointer to use, which is either the one that
   // the unit test sets (using SetTabContentsForUnitTest) or the one from
   // the browser window.
   TabContents* GetTabContents() const;
 
   // How many items (max) to show in the back/forward history menu dropdown.
   static const int kMaxHistoryItems;
 
   // How many chapter-stops (max) to show in the back/forward dropdown list.
   static const int kMaxChapterStops;
 
  protected:
-  BackForwardMenuModel()
-      : browser_(NULL),
-        test_tab_contents_(NULL),
-        model_type_(FORWARD_MENU_DELEGATE) {}
-
   Browser* browser_;

[sky, 2009/06/15 15:50:50]

nit: while you're here, could you move the members after the functions.

 
   // The unit tests will provide their own TabContents to use.
   TabContents* test_tab_contents_;
 
   // Represents whether this is the delegate for the forward button or the
   // back button.
   ModelType model_type_;
 
   // Converts a menu item id, as passed in through one of the menu delegate
   // functions and converts it into an absolute index into the
   // NavigationEntryList vector. |menu_id| can point to a separator, or the
   // "Show Full History" link in which case this function returns -1.
   int MenuIdToNavEntryIndex(int menu_id) const;
 
   // Looks up a NavigationEntry by menu id.
   NavigationEntry* GetNavigationEntry(int menu_id) const;
 
   // Build a string version of a user action on this menu, used as an
   // identifier for logging user behavior.
   // E.g. BuildActionName("Click", 2) returns "BackMenu_Click2".
   // An index of -1 means no index.
   std::wstring BuildActionName(const std::wstring& name, int index) const;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(BackForwardMenuModel);
 };
 
 #endif  // CHROME_BROWSER_BACK_FORWARD_MENU_MODEL_H_