Share the code that builds the page menu in a common model, make Mac and Win ...

chrome/browser/views/toolbar_view.h

 // Copyright (c) 2009 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"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/bubble_positioner.h"
 #include "chrome/browser/command_updater.h"
+#include "chrome/browser/page_menu_model.h"
 #include "chrome/browser/user_data_manager.h"
 #include "chrome/browser/views/accessible_toolbar_view.h"
 #include "chrome/browser/views/go_button.h"
 #include "chrome/browser/views/location_bar_view.h"
 #include "chrome/common/pref_member.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/menu/menu.h"
 #include "views/controls/menu/view_menu_delegate.h"
 #include "views/view.h"
 
 class BackForwardMenuModelViews;
 class BrowserActionsContainer;
 class Browser;
 class Profile;
 class ToolbarStarToggle;
 
 namespace views {
 class Menu2;
 }
 
-// A menu model that builds the contents of an encoding menu.
-class EncodingMenuModel : public menus::SimpleMenuModel,
-                          public menus::SimpleMenuModel::Delegate {
- public:
-  explicit EncodingMenuModel(Browser* browser);
-  virtual ~EncodingMenuModel() {}
-
-  // Overridden from menus::SimpleMenuModel::Delegate:
-  virtual bool IsCommandIdChecked(int command_id) const;
-  virtual bool IsCommandIdEnabled(int command_id) const;
-  virtual bool GetAcceleratorForCommandId(int command_id,
-                                          menus::Accelerator* accelerator);
-  virtual void ExecuteCommand(int command_id);
-
- private:
-  void Build();
-
-  Browser* browser_;
-
-  DISALLOW_COPY_AND_ASSIGN(EncodingMenuModel);
-};
-
-class ZoomMenuModel : public menus::SimpleMenuModel {
- public:
-  explicit ZoomMenuModel(menus::SimpleMenuModel::Delegate* delegate);
-  virtual ~ZoomMenuModel() {}
-
- private:
-  void Build();
-
-  DISALLOW_COPY_AND_ASSIGN(ZoomMenuModel);
-};
-
 // The Browser Window's toolbar.
 class ToolbarView : public AccessibleToolbarView,
                     public views::ViewMenuDelegate,
                     public views::DragController,
                     public menus::SimpleMenuModel::Delegate,
                     public LocationBarView::Delegate,
                     public NotificationObserver,
                     public GetProfilesHelper::Delegate,
                     public CommandUpdater::CommandObserver,
                     public views::ButtonListener,
@@ skipping 90 matching lines @@
   void CreateCenterStack(Profile* profile);
   void CreateRightSideControls(Profile* profile);
   void LoadLeftSideControlsImages();
   void LoadCenterStackImages();
   void LoadRightSideControlsImages();
 
   // Runs various menus.
   void RunPageMenu(const gfx::Point& pt);
   void RunAppMenu(const gfx::Point& pt);
 
-  void CreatePageMenu();
-  void CreateZoomMenuContents();
-  void CreateEncodingMenuContents();
-#if defined(OS_WIN)
-  void CreateDevToolsMenuContents();
-#endif
   void CreateAppMenu();
 
   // Types of display mode this toolbar can have.
   enum DisplayMode {
     DISPLAYMODE_NORMAL,       // Normal toolbar with buttons, etc.
     DISPLAYMODE_LOCATION      // Slimline toolbar showing only compact location
                               // bar, used for popups.
   };
   bool IsDisplayModeNormal() const {
     return display_mode_ == DISPLAYMODE_NORMAL;
@@ skipping 27 matching lines @@
   // Helper class to enumerate profiles information on the file thread.
   scoped_refptr<GetProfilesHelper> profiles_helper_;
 
   // Controls whether or not a home button should be shown on the toolbar.
   BooleanPrefMember show_home_button_;
 
   // The display mode used when laying out the toolbar.
   DisplayMode display_mode_;
 
   // The contents of the various menus.
-  scoped_ptr<menus::SimpleMenuModel> page_menu_contents_;
-  scoped_ptr<ZoomMenuModel> zoom_menu_contents_;
-  scoped_ptr<EncodingMenuModel> encoding_menu_contents_;
-  scoped_ptr<menus::SimpleMenuModel> devtools_menu_contents_;
+  scoped_ptr<PageMenuModel> page_menu_model_;
   scoped_ptr<menus::SimpleMenuModel> app_menu_contents_;
 
   // TODO(beng): build these into MenuButton.
   scoped_ptr<views::Menu2> page_menu_menu_;
   scoped_ptr<views::Menu2> app_menu_menu_;
 };
 
 #endif  // CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_