Replace ExtensionAction with ExtensionAction2.

chrome/browser/gtk/browser_actions_toolbar_gtk.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/gtk/browser_actions_toolbar_gtk.h"
 
 #include <gtk/gtk.h>
 #include <vector>
 
 #include "app/gfx/canvas_paint.h"
 #include "app/gfx/gtk_util.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/extensions/image_loading_tracker.h"
 #include "chrome/browser/gtk/extension_popup_gtk.h"
 #include "chrome/browser/gtk/gtk_chrome_button.h"
 #include "chrome/browser/gtk/gtk_theme_provider.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/extensions/extension.h"
-#include "chrome/common/extensions/extension_action2.h"
+#include "chrome/common/extensions/extension_action.h"
 #include "chrome/common/gtk_util.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_source.h"
 #include "chrome/common/notification_type.h"
 
 // The size of each button on the toolbar.
 static const int kButtonSize = 29;
 
 // The padding between browser action buttons. Visually, the actual number of
@@ skipping 28 matching lines @@
                     Extension::kBrowserActionIconMaxSize));
     }
 
     // We need to hook up extension popups here. http://crbug.com/23897
     g_signal_connect(button_.get(), "clicked",
                      G_CALLBACK(OnButtonClicked), this);
     g_signal_connect_after(button_.get(), "expose-event",
                            G_CALLBACK(OnExposeEvent), this);
 
     registrar_.Add(this, NotificationType::EXTENSION_BROWSER_ACTION_UPDATED,
-                   Source<ExtensionAction2>(extension->browser_action()));
+                   Source<ExtensionAction>(extension->browser_action()));
     registrar_.Add(this, NotificationType::BROWSER_THEME_CHANGED,
                    NotificationService::AllSources());
 
     OnThemeChanged();
   }
 
   ~BrowserActionButton() {
     if (tab_specific_icon_)
       g_object_unref(tab_specific_icon_);
 
@@ skipping 73 matching lines @@
    }
   }
 
   static gboolean OnExposeEvent(GtkWidget* widget,
                                 GdkEventExpose* event,
                                 BrowserActionButton* button) {
     int tab_id = button->toolbar_->GetCurrentTabId();
     if (tab_id < 0)
       return FALSE;
 
-    ExtensionAction2* action = button->extension_->browser_action();
+    ExtensionAction* action = button->extension_->browser_action();
     if (action->GetBadgeText(tab_id).empty())
       return FALSE;
 
     gfx::CanvasPaint canvas(event, false);
     gfx::Rect bounding_rect(widget->allocation);
     action->PaintBadge(&canvas, bounding_rect, tab_id);
     return FALSE;
   }
 
   // The toolbar containing this button.
@@ skipping 97 matching lines @@
   if (extension_button_map_.erase(extension->id()))
     UpdateVisibility();
 }
 
 void BrowserActionsToolbarGtk::UpdateVisibility() {
   if (button_count() == 0)
     gtk_widget_hide(widget());
   else
     gtk_widget_show(widget());
 }