Replace ExtensionAction with ExtensionAction2.

chrome/browser/views/location_bar_view.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/location_bar_view.h"
 
 #if defined(OS_LINUX)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 91 matching lines @@
 }
 
 void LocationBarView::PageActionWithBadgeView::Layout() {
   image_view_->SetBounds(0, 0, width(), height());
 }
 
 void LocationBarView::PageActionWithBadgeView::PaintChildren(
     gfx::Canvas* canvas) {
   View::PaintChildren(canvas);
 
-  ExtensionAction2* action = image_view_->page_action();
+  ExtensionAction* action = image_view_->page_action();
   int tab_id = image_view_->current_tab_id();
   if (tab_id < 0)
     return;
 
   action->PaintBadge(canvas, gfx::Rect(width(), height()), tab_id);
 }
 
 void LocationBarView::PageActionWithBadgeView::UpdateVisibility(
     TabContents* contents, const GURL& url) {
   image_view_->UpdateVisibility(contents, url);
@@ skipping 554 matching lines @@
   if (!page_action_views_.empty()) {
     for (size_t i = 0; i < page_action_views_.size(); ++i)
       RemoveChildView(page_action_views_[i]);
     STLDeleteContainerPointers(page_action_views_.begin(),
                                page_action_views_.end());
     page_action_views_.clear();
   }
 }
 
 void LocationBarView::RefreshPageActionViews() {
-  std::vector<ExtensionAction2*> page_actions;
+  std::vector<ExtensionAction*> page_actions;
   ExtensionsService* service = profile_->GetExtensionsService();
   if (!service)
     return;
 
   for (size_t i = 0; i < service->extensions()->size(); ++i) {
     if (service->extensions()->at(i)->page_action())
       page_actions.push_back(service->extensions()->at(i)->page_action());
   }
 
   // On startup we sometimes haven't loaded any extensions. This makes sure
@@ skipping 525 matching lines @@
   ShowInfoBubbleImpl(text, GetColor(
       model_->GetSecurityLevel() == ToolbarModel::SECURE,
       SECURITY_INFO_BUBBLE_TEXT));
 }
 
 // PageActionImageView----------------------------------------------------------
 
 LocationBarView::PageActionImageView::PageActionImageView(
     LocationBarView* owner,
     Profile* profile,
-    ExtensionAction2* page_action,
+    ExtensionAction* page_action,
     const BubblePositioner* bubble_positioner)
     : LocationBarImageView(bubble_positioner),
       owner_(owner),
       profile_(profile),
       page_action_(page_action),
       current_tab_id_(-1) {
   Extension* extension = profile->GetExtensionsService()->GetExtensionById(
       page_action->extension_id());
   DCHECK(extension);
 
@@ skipping 156 matching lines @@
 }
 
 int LocationBarView::PageActionVisibleCount() {
   int result = 0;
   for (size_t i = 0; i < page_action_views_.size(); i++) {
     if (page_action_views_[i]->IsVisible())
       ++result;
   }
   return result;
 }