Replace ExtensionAction with ExtensionAction2.

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 42 matching lines @@
       browser_action_(extension->browser_action()),
       extension_(extension),
       tracker_(NULL),
       panel_(panel) {
   set_alignment(TextButton::ALIGN_CENTER);
 
   // No UpdateState() here because View heirarchy not setup yet. Our parent
   // should call UpdateState() after creation.
 
   registrar_.Add(this, NotificationType::EXTENSION_BROWSER_ACTION_UPDATED,
-                 Source<ExtensionAction2>(browser_action_));
+                 Source<ExtensionAction>(browser_action_));
 }
 
 BrowserActionButton::~BrowserActionButton() {
   if (tracker_) {
     tracker_->StopTrackingImageLoad();
     tracker_ = NULL;  // The tracker object will be deleted when we return.
   }
 }
 
 gfx::Insets BrowserActionButton::GetInsets() const {
@@ skipping 124 matching lines @@
   AddChildView(button_);
   button_->UpdateState();
 }
 
 void BrowserActionView::Layout() {
   button_->SetBounds(0, kControlVertOffset, width(), kButtonSize);
 }
 
 void BrowserActionView::PaintChildren(gfx::Canvas* canvas) {
   View::PaintChildren(canvas);
-  ExtensionAction2* action = button()->browser_action();
+  ExtensionAction* action = button()->browser_action();
   int tab_id = panel_->GetCurrentTabId();
   if (tab_id < 0)
     return;
 
   action->PaintBadge(canvas, gfx::Rect(width(), height()), tab_id);
 }
 
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserActionsContainer
@@ skipping 110 matching lines @@
   }
 }
 
 void BrowserActionsContainer::TestExecuteBrowserAction(int index) {
   BrowserActionButton* button = browser_action_views_[index]->button();
   OnBrowserActionExecuted(button);
 }
 
 void BrowserActionsContainer::OnBrowserActionExecuted(
     BrowserActionButton* button) {
-  ExtensionAction2* browser_action = button->browser_action();
+  ExtensionAction* browser_action = button->browser_action();
 
   // Popups just display.  No notification to the extension.
   // TODO(erikkay): should there be?
   if (button->IsPopup()) {
     // If we're showing the same popup, just hide it and return.
     bool same_showing = popup_ && button == popup_button_;
 
     // Always hide the current popup, even if it's not the same.
     // Only one popup should be visible at a time.
     HidePopup();
@@ skipping 102 matching lines @@
       std::min(static_cast<int>(browser_action_views_.size()),
                kMinimumNumberOfVisibleBrowserActions) * kButtonSize;
 
   // 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 % kButtonSize +
                   kHorizontalPadding * 2);
 }