Update browser actions api to be like new design doc.

chrome/browser/views/browser_actions_container.cc

Index: chrome/browser/views/browser_actions_container.cc
diff --git a/chrome/browser/views/browser_actions_container.cc b/chrome/browser/views/browser_actions_container.cc
index d7b610d223151fe67e20baf5962606d96c90f740..1c0733fc292d6cf4d9e47a72f51481dbc3072c47 100644
--- a/chrome/browser/views/browser_actions_container.cc
+++ b/chrome/browser/views/browser_actions_container.cc
@@ -165,7 +165,7 @@ void BrowserActionButton::ButtonPressed(
 
 void BrowserActionButton::OnImageLoaded(SkBitmap* image, size_t index) {
   DCHECK(index < browser_action_icons_.size());
-  browser_action_icons_[index] = *image;
+  browser_action_icons_[index] = image ? *image : SkBitmap();
   if (index == browser_action_icons_.size() - 1) {
     OnStateUpdated();
     tracker_ = NULL;  // The tracker object will delete itself when we return.
@@ -482,9 +482,8 @@ void BrowserActionsContainer::OnBrowserActionExecuted(
   }
 
   // Otherwise, we send the action to the extension.
-  int window_id = ExtensionTabUtil::GetWindowId(toolbar_->browser());
   ExtensionBrowserEventRouter::GetInstance()->BrowserActionExecuted(
-      profile_, browser_action.extension_id(), window_id);
+      profile_, browser_action.extension_id(), toolbar_->browser());
 }
 
 gfx::Size BrowserActionsContainer::GetPreferredSize() {