Re-factor location bar/toolbar code to get rid of the browser dependency.

chrome/browser/ui/views/location_bar/page_action_image_view.h

Index: chrome/browser/ui/views/location_bar/page_action_image_view.h
diff --git a/chrome/browser/ui/views/location_bar/page_action_image_view.h b/chrome/browser/ui/views/location_bar/page_action_image_view.h
index 139018948337a496ad0bd049a8afd69a41821e07..ef96d12f09b10a2c3b844e245daf54edfd539fd4 100644
--- a/chrome/browser/ui/views/location_bar/page_action_image_view.h
+++ b/chrome/browser/ui/views/location_bar/page_action_image_view.h
@@ -15,6 +15,7 @@
 #include "chrome/browser/ui/views/extensions/extension_popup.h"
 #include "ui/views/controls/image_view.h"
 
+class Browser;
 class LocationBarView;
 
 namespace content {
@@ -33,7 +34,8 @@ class PageActionImageView : public views::ImageView,
                             public content::NotificationObserver {
  public:
   PageActionImageView(LocationBarView* owner,
-                      ExtensionAction* page_action);
+                      ExtensionAction* page_action,
+                      Browser* browser);
   virtual ~PageActionImageView();
 
   ExtensionAction* page_action() { return page_action_; }
@@ -91,6 +93,9 @@ class PageActionImageView : public views::ImageView,
   // us, it resides in the extension of this particular profile.
   ExtensionAction* page_action_;
 
+  // The corresponding browser.
+  Browser* browser_;
+
   // A cache of bitmaps the page actions might need to show, mapped by path.
   typedef std::map<std::string, SkBitmap> PageActionMap;
   PageActionMap page_action_icons_;