Linux: implement Page Actions support.

chrome/browser/views/location_bar_view.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_LOCATION_BAR_VIEW_H_
 #define CHROME_BROWSER_VIEWS_LOCATION_BAR_VIEW_H_
 
 #include <string>
 #include <vector>
 
 #include "app/gfx/font.h"
 #include "base/gfx/rect.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
+#include "chrome/browser/image_loading_tracker.h"
 #include "chrome/browser/location_bar.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/toolbar_model.h"
 #include "chrome/browser/views/info_bubble.h"
 #include "views/controls/image_view.h"
 #include "views/controls/label.h"
 #include "views/controls/native/native_view_host.h"
 #include "views/painter.h"
 
 #if defined(OS_WIN)
@@ skipping 302 matching lines @@
 
     Profile* profile_;
 
     ToolbarModel* model_;
 
     DISALLOW_COPY_AND_ASSIGN(SecurityImageView);
   };
 
   // PageActionImageView is used to display the icon for a given PageAction
   // and notify the extension when the icon is clicked.
-  class PageActionImageView : public LocationBarImageView {
+  class PageActionImageView : public LocationBarImageView,
+                              public ImageLoadingTracker::Observer {
    public:
     PageActionImageView(
         LocationBarView* owner, Profile* profile,
         const PageAction* page_action);
     virtual ~PageActionImageView();
 
     // Overridden from view for the mouse hovering.
     virtual bool OnMousePressed(const views::MouseEvent& event);
 
     // Overridden from LocationBarImageView.
     virtual void ShowInfoBubble();
 
+    // Overridden from ImageLoadingTracker.
+    virtual void OnImageLoaded(SkBitmap* image, size_t index);
+
     // 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 for when the image has loaded.
-    void OnImageLoaded(SkBitmap* image, size_t index);
-
    private:
-    // We load the images for the PageActions on the file thread. These tasks
-    // help with that.
-    class LoadImageTask;
-    class ImageLoadingTracker;
-
     // The location bar view that owns us.
     LocationBarView* 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 PageAction* page_action_;
 
@@ skipping 51 matching lines @@
   // made invisible.
   void LayoutView(bool leading, views::View* view, int available_width,
                   gfx::Rect* bounds);
 
   // Sets the security icon to display.  Note that no repaint is done.
   void SetSecurityIcon(ToolbarModel::Icon icon);
 
   // Delete all page action views that we have created.
   void DeletePageActionViews();
 
-  // Retrieves a vector of all page actions, irrespective of which
-  // extension they belong to.
-  std::vector<PageAction*> GetPageActions();
-
   // Update the views for the Page Actions, to reflect state changes for
   // PageActions.
   void RefreshPageActionViews();
 
   // Sets the text that should be displayed in the info label and its associated
   // tooltip text.  Call with an empty string if the info label should be
   // hidden.
   void SetInfoText(const std::wstring& text,
                    ToolbarModel::InfoTextType text_type,
                    const std::wstring& tooltip_text);
@@ skipping 78 matching lines @@
   // The positioner that places the autocomplete popup.
   AutocompletePopupPositioner* popup_positioner_;
 
   // Storage of string needed for accessibility.
   std::wstring accessible_name_;
 
   DISALLOW_COPY_AND_ASSIGN(LocationBarView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_LOCATION_BAR_VIEW_H_