Move page actions over to ExtensionAction2

chrome/browser/gtk/location_bar_view_gtk.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_GTK_LOCATION_BAR_VIEW_GTK_H_
 #define CHROME_BROWSER_GTK_LOCATION_BAR_VIEW_GTK_H_
 
 #include <gtk/gtk.h>
 
 #include <string>
-#include <vector>
+#include <map>

[Evan Stade, 2009/10/26 23:07:22]

nit: map before string

 
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
 #include "base/scoped_vector.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view_gtk.h"
 #include "chrome/browser/extensions/image_loading_tracker.h"
 #include "chrome/browser/location_bar.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/owned_widget_gtk.h"
 #include "chrome/common/page_transition_types.h"
+#include "third_party/skia/include/core/SkBitmap.h"
 #include "webkit/glue/window_open_disposition.h"
 
 class AutocompleteEditViewGtk;
 class BubblePositioner;
 class Browser;
 class CommandUpdater;
 class GtkThemeProvider;
-class ExtensionAction;
+class ExtensionAction2;

[Evan Stade, 2009/10/26 23:07:22]

nit: alphabets

 class Profile;
 class SkBitmap;
 class TabContents;
 class ToolbarModel;
 
 class LocationBarViewGtk : public AutocompleteEditController,
                            public LocationBar,
                            public LocationBarTesting,
                            public NotificationObserver {
  public:
@@ skipping 56 matching lines @@
 
   // Translation between a security level and the background color.  Both the
   // location bar and edit have to manage and match the background color.
   static const GdkColor kBackgroundColorByLevel[3];
 
  private:
   class PageActionViewGtk : public ImageLoadingTracker::Observer {
    public:
     PageActionViewGtk(
         LocationBarViewGtk* owner, Profile* profile,
-        const ExtensionAction* page_action);
+        ExtensionAction2* page_action);
     virtual ~PageActionViewGtk();
 
     GtkWidget* widget() { return event_box_.get(); }
 
     // Called to notify the PageAction that it should determine whether to be
     // visible or hidden. |contents| is the TabContents that is active, |url|
     // is the current page URL.
     void UpdateVisibility(TabContents* contents, GURL url);
 
     // A callback from ImageLoadingTracker for when the image has loaded.
     virtual void OnImageLoaded(SkBitmap* image, size_t index);
 
    private:
     static gboolean OnButtonPressed(GtkWidget* sender, GdkEventButton* event,
                                     PageActionViewGtk* page_action_view);
     static gboolean OnExposeEvent(GtkWidget* widget,
                                   GdkEventExpose* event,
                                   PageActionViewGtk* page_action_view);
 
     // The location bar view that owns us.
     LocationBarViewGtk* owner_;
 
     // The current profile (not owned by us).
     Profile* profile_;
 
     // The PageAction that this view represents. The PageAction is not owned by
     // us, it resides in the extension of this particular profile.
-    const ExtensionAction* page_action_;
+    ExtensionAction2* page_action_;
 
-    // The icons representing different states for the page action.
-    std::vector<GdkPixbuf*> pixbufs_;
+    // A cache of all the different icon paths associated with this page action.
+    typedef std::map<std::string, GdkPixbuf*> PixbufMap;
+    PixbufMap pixbufs_;
 
     // A cache of the last dynamically generated bitmap and the pixbuf that
     // corresponds to it. We keep track of both so we can free old pixbufs as
     // their icons are replaced.
-    SkBitmap* last_icon_skbitmap_;
+    SkBitmap last_icon_skbitmap_;
     GdkPixbuf* last_icon_pixbuf_;
 
     // The object that is waiting for the image loading to complete
     // asynchronously.  It will delete itself once it is done.
     ImageLoadingTracker* tracker_;
 
     // The widgets for this page action.
     OwnedWidgetGtk event_box_;
     OwnedWidgetGtk image_;
 
@@ skipping 89 matching lines @@
 
   // Provides colors and rendering mode.
   GtkThemeProvider* theme_provider_;
 
   NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(LocationBarViewGtk);
 };
 
 #endif  // CHROME_BROWSER_GTK_LOCATION_BAR_VIEW_GTK_H_