Move the PageAction parts of ExtensionTabHelper::DidNavigateMainFrame to the PageActionController.

Test that the page actions are reset on navigation.

Review URL: https://chromiumcodereview.appspot.com/10685007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145054 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 1 deletions

diff --git a/chrome/browser/extensions/page_action_controller.h b/chrome/browser/extensions/page_action_controller.h
index e9afaf0..8c9941d 100644
--- a/chrome/browser/extensions/page_action_controller.h
+++ b/chrome/browser/extensions/page_action_controller.h
@@ -11,6 +11,7 @@
 
 #include "base/observer_list.h"
 #include "chrome/browser/extensions/location_bar_controller.h"
+#include "content/public/browser/web_contents_observer.h"
 
 class ExtensionService;
 class TabContents;
@@ -19,7 +20,8 @@ namespace extensions {
 
 // A LocationBarController which populates the location bar with icons based
 // on the page_action extension API.
-class PageActionController : public LocationBarController {
+class PageActionController : public LocationBarController,
+                             public content::WebContentsObserver {
  public:
   explicit PageActionController(TabContents* tab_contents);
   virtual ~PageActionController();
@@ -30,6 +32,11 @@ class PageActionController : public LocationBarController {
                            int mouse_button) OVERRIDE;
   virtual void NotifyChange() OVERRIDE;
 
+  // content::WebContentsObserver implementation.
+  virtual void DidNavigateMainFrame(
+      const content::LoadCommittedDetails& details,
+      const content::FrameNavigateParams& params) OVERRIDE;
+
  private:
   // Gets the ExtensionService for |tab_contents_|.
   ExtensionService* GetExtensionService() const;