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

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

 // Copyright (c) 2012 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_UI_VIEWS_LOCATION_BAR_PAGE_ACTION_IMAGE_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_PAGE_ACTION_IMAGE_VIEW_H_
 #pragma once
 
 #include <map>
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/extensions/extension_context_menu_model.h"
 #include "chrome/browser/extensions/image_loading_tracker.h"
 #include "chrome/browser/ui/views/extensions/extension_popup.h"
 #include "ui/views/controls/image_view.h"
 
+class Browser;
 class LocationBarView;
 
 namespace content {
 class WebContents;
 }
 namespace views {
 class MenuRunner;
 }
 
 // PageActionImageView is used by the LocationBarView to display the icon for a
 // given PageAction and notify the extension when the icon is clicked.
 class PageActionImageView : public views::ImageView,
                             public ImageLoadingTracker::Observer,
                             public ExtensionContextMenuModel::PopupDelegate,
                             public views::Widget::Observer,
                             public content::NotificationObserver {
  public:
   PageActionImageView(LocationBarView* owner,
-                      ExtensionAction* page_action);
+                      ExtensionAction* page_action,
+                      Browser* browser);
   virtual ~PageActionImageView();
 
   ExtensionAction* page_action() { return page_action_; }
 
   int current_tab_id() { return current_tab_id_; }
 
   void set_preview_enabled(bool preview_enabled) {
     preview_enabled_ = preview_enabled;
   }
 
@@ skipping 37 matching lines @@
   // Hides the active popup, if there is one.
   void HidePopup();
 
   // The location bar view that owns us.
   LocationBarView* owner_;
 
   // The PageAction that this view represents. The PageAction is not owned by
   // 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_;
 
   // The object that is waiting for the image loading to complete
   // asynchronously.
   ImageLoadingTracker tracker_;
 
   // The tab id we are currently showing the icon for.
   int current_tab_id_;
@@ skipping 16 matching lines @@
   // The extension keybinding accelerator this page action is listening for (to
   // show the popup).
   scoped_ptr<ui::Accelerator> keybinding_;
 
   scoped_ptr<views::MenuRunner> menu_runner_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(PageActionImageView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_PAGE_ACTION_IMAGE_VIEW_H_