Pull browser action click logic into ToolbarModelController, so that when I

chrome/browser/ui/views/browser_actions_container.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_BROWSER_ACTIONS_CONTAINER_H_
 #define CHROME_BROWSER_UI_VIEWS_BROWSER_ACTIONS_CONTAINER_H_
 #pragma once
 
 #include <set>
 #include <string>
@@ skipping 352 matching lines @@
   // Overridden from BrowserActionOverflowMenuController::Observer:
   virtual void NotifyMenuDeleted(
       BrowserActionOverflowMenuController* controller) OVERRIDE;
 
   // Overridden from views::Widget::Observer
   virtual void OnWidgetClosing(views::Widget* widget) OVERRIDE;
 
   // Moves a browser action with |id| to |new_index|.
   void MoveBrowserAction(const std::string& extension_id, size_t new_index);
 
+  // Show a popup.
+  void ShowPopup(BrowserActionButton* button, const GURL& popup_url);

[Yoyo Zhou, 2012/05/24 00:55:26]

Does this need to be public?

[not at google - send to devlin, 2012/05/25 00:55:40]

Nope. Thanks, made private (I put it here to be alongside its friend HidePopup
which apparently needs to be public for some testing util stuff).

+
   // Hide the current popup.
   void HidePopup();
 
   // Simulate a click on a browser action button.  This should only be
   // used by unit tests.
   void TestExecuteBrowserAction(int index);
 
   // Retrieve the current popup.  This should only be used by unit tests.
   ExtensionPopup* TestGetPopup() { return popup_; }
 
@@ skipping 142 matching lines @@
 
   base::WeakPtrFactory<BrowserActionsContainer> task_factory_;
 
   // Handles delayed showing of the overflow menu when hovering.
   base::WeakPtrFactory<BrowserActionsContainer> show_menu_task_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_BROWSER_ACTIONS_CONTAINER_H_