Replace ExtensionAction with ExtensionAction2.

chrome/browser/views/browser_actions_container.h

 // 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.
 
 #ifndef CHROME_BROWSER_VIEWS_BROWSER_ACTIONS_PANEL_H_
 #define CHROME_BROWSER_VIEWS_BROWSER_ACTIONS_PANEL_H_
 
 #include <vector>
 
 #include "base/task.h"
 #include "chrome/browser/extensions/image_loading_tracker.h"
 #include "chrome/browser/views/browser_bubble.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "views/controls/button/menu_button.h"
 #include "views/view.h"
 
 class BrowserActionsContainer;
 class Extension;
-class ExtensionAction2;
+class ExtensionAction;
 class ExtensionPopup;
 class Profile;
 class ToolbarView;
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserActionButton
 
 // The BrowserActionButton is a specialization of the MenuButton class.
-// It acts on a ExtensionAction2, in this case a BrowserAction and handles
+// It acts on a ExtensionAction, in this case a BrowserAction and handles
 // loading the image for the button asynchronously on the file thread to
 class BrowserActionButton : public views::MenuButton,
                             public views::ButtonListener,
                             public ImageLoadingTracker::Observer,
                             public NotificationObserver {
  public:
   BrowserActionButton(Extension* extension, BrowserActionsContainer* panel);
   ~BrowserActionButton();
 
-  ExtensionAction2* browser_action() const { return browser_action_; }
+  ExtensionAction* browser_action() const { return browser_action_; }
   Extension* extension() { return extension_; }
 
   // Called to update the display to match the browser action's state.
   void UpdateState();
 
   // Overriden from views::View. Return a 0-inset so the icon can draw all the
   // way to the edge of the view if it wants.
   virtual gfx::Insets GetInsets() const;
 
   // Overridden from views::ButtonListener:
@@ skipping 22 matching lines @@
   virtual bool IsPopup();
 
   // Notifications when the popup is hidden or shown by the container.
   virtual void PopupDidShow();
   virtual void PopupDidHide();
 
  private:
   // If the image from the browser action needs to be loaded, load it.
   void LoadImage();
 
-  // The browser action this view represents. The ExtensionAction2 is not owned
+  // The browser action this view represents. The ExtensionAction is not owned
   // by this class.
-  ExtensionAction2* browser_action_;
+  ExtensionAction* browser_action_;
 
   // The extension associated with the browser action we're displaying.
   Extension* extension_;
 
   // The icons representing different states for the browser action.
   std::vector<SkBitmap> browser_action_icons_;
 
   // The object that is waiting for the image loading to complete
   // asynchronously. This object can potentially outlive the BrowserActionView,
   // and takes care of deleting itself.
@@ skipping 125 matching lines @@
   // The button that triggered the current popup (just a reference to a button
   // from browser_action_views_).
   BrowserActionButton* popup_button_;
 
   ScopedRunnableMethodFactory<BrowserActionsContainer> task_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_BROWSER_ACTIONS_PANEL_H_