Refactor implementation of BrowserActions, and add support for

chrome/browser/gtk/browser_actions_toolbar_gtk.h

Index: chrome/browser/gtk/browser_actions_toolbar_gtk.h
diff --git a/chrome/browser/gtk/browser_actions_toolbar_gtk.h b/chrome/browser/gtk/browser_actions_toolbar_gtk.h
index 421088972501b7c13e5ddf707f1c098ef7a866df..015b5c9c13e9dd5ff16159170fac43c29a0c3835 100644
--- a/chrome/browser/gtk/browser_actions_toolbar_gtk.h
+++ b/chrome/browser/gtk/browser_actions_toolbar_gtk.h
@@ -29,6 +29,14 @@ class BrowserActionsToolbarGtk : public NotificationObserver {
 
   int button_count() { return extension_button_map_.size(); }
 
+  Browser* browser() { return browser_; }
+
+  // Returns the currently selected tab ID, or -1 if there is none.
+  int GetCurrentTabId();
+
+  // Update the display of all buttons.
+  void Update();
+
   // NotificationObserver implementation.
   void Observe(NotificationType type,
                const NotificationSource& source,
@@ -63,7 +71,9 @@ class BrowserActionsToolbarGtk : public NotificationObserver {
   // Map from extension ID to BrowserActionButton, which is a wrapper for
   // a chrome button and related functionality. There should be one entry
   // for every extension that has a browser action.
-  std::map<std::string, linked_ptr<BrowserActionButton> > extension_button_map_;
+  typedef std::map<std::string, linked_ptr<BrowserActionButton> >
+      ExtensionButtonMap;
+  ExtensionButtonMap extension_button_map_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserActionsToolbarGtk);
 };