Update browser actions api to be like new design doc.

chrome/browser/views/browser_actions_container.cc

 // 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.
 
 #include "chrome/browser/views/browser_actions_container.h"
 
 #include "app/gfx/canvas.h"
 #include "app/resource_bundle.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
@@ skipping 147 matching lines @@
   return zero_inset;
 }
 
 void BrowserActionButton::ButtonPressed(
     views::Button* sender, const views::Event& event) {
   panel_->OnBrowserActionExecuted(this);
 }
 
 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.
   }
 }
 
 void BrowserActionButton::OnStateUpdated() {
   SkBitmap* image = browser_action_state_->icon();
   if (!image)
     image = &browser_action_icons_[browser_action_state_->icon_index()];
@@ skipping 296 matching lines @@
                                   toolbar_->browser(),
                                   rect,
                                   browser_action.popup_height());
     popup_->set_delegate(this);
     popup_button_ = button;
     popup_button_->PopupDidShow();
     return;
   }
 
   // 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() {
   if (browser_action_views_.empty())
     return gfx::Size(0, 0);
   int width = kHorizontalPadding * 2 +
       browser_action_views_.size() * kIconSize;
   return gfx::Size(width, kIconSize);
 }
 
@@ skipping 54 matching lines @@
       std::min(static_cast<int>(browser_action_views_.size()),
                kMinimumNumberOfVisibleBrowserActions) * kIconSize;
 
   // Even if available_width is <= 0, we still return at least the |min_width|.
   if (available_width <= 0)
     return min_width;
 
   return std::max(min_width, available_width - available_width % kIconSize +
                   kHorizontalPadding * 2);
 }