Remove print and move bookmark to the top of the action box.

chrome/browser/ui/toolbar/action_box_button_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_TOOLBAR_ACTION_BOX_BUTTON_CONTROLLER_H_
 #define CHROME_BROWSER_UI_TOOLBAR_ACTION_BOX_BUTTON_CONTROLLER_H_
 
 #include <map>
 #include <string>
 
@@ skipping 26 matching lines @@
     // Shows the menu with the given |menu_model|.
     virtual void ShowMenu(scoped_ptr<ActionBoxMenuModel> menu_model);
 
    protected:
     virtual ~Delegate() {}
   };
 
   ActionBoxButtonController(Browser* browser, Delegate* delegate);
   virtual ~ActionBoxButtonController();
 
+  // Creates and populates an ActionBoxMenuModel according to the current
+  // state of the browser.
+  scoped_ptr<ActionBoxMenuModel> CreateMenuModel();

[Mike Wittman, 2013/04/10 20:44:04]

make private and expose via a test api.  see e.g. ui::Event::TestApi

[Rune Fevang, 2013/04/10 21:17:48]

I've ended up adding this function a couple of times (for now abandoned CLs), so
the main motivation for adding it was not to facilitate testing (I could have
called OnButtonClicked and implemented ShowMenu for that).

I actually considered getting rid of the Delegate class and OnButtonClicked and
having callers instead calling CreateMenuModel and showing the menu themselves.
What do you think? I didn't do it because I wasn't really sure why it was done
this way in the first place, and was worried it was wrong from an idealized MVC
perspective.

[Mike Wittman, 2013/04/10 22:16:01]

The delegate doesn't appear to be providing a lot of value in the current code. 
But if the controller were to get more complicated, it seems like a useful
mechanism to separate the cross-platform and platform-dependent input handling.

+
   // Notifies this that the action box button has been clicked.
   // Methods on the Delegate may be called re-entrantly.
   void OnButtonClicked();
 
   // Overridden from ui::SimpleMenuModel::Delegate:
   virtual bool IsCommandIdChecked(int command_id) const OVERRIDE;
   virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE;
   virtual bool GetAcceleratorForCommandId(
       int command_id,
       ui::Accelerator* accelerator) OVERRIDE;
@@ skipping 20 matching lines @@
 
   // The command ID to assign to the next dynamic entry that needs one.
   int next_command_id_;
 
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(ActionBoxButtonController);
 };
 
 #endif  // CHROME_BROWSER_UI_TOOLBAR_ACTION_BOX_BUTTON_CONTROLLER_H_