Copy the !details.is_in_page restriction from TabHelper to PageActionController::DidNavigateMainFra…

chrome/browser/extensions/page_action_controller.cc

Index: chrome/browser/extensions/page_action_controller.cc
diff --git a/chrome/browser/extensions/page_action_controller.cc b/chrome/browser/extensions/page_action_controller.cc
index 3726336c3998cc2722b09c565a86434a73fcc513..5b95834676a53d507053680d8dc1d622d01d98f3 100644
--- a/chrome/browser/extensions/page_action_controller.cc
+++ b/chrome/browser/extensions/page_action_controller.cc
@@ -14,6 +14,7 @@
 #include "chrome/common/extensions/extension_set.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/invalidate_type.h"
+#include "content/public/browser/navigation_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 
@@ -86,6 +87,9 @@ void PageActionController::NotifyChange() {
 void PageActionController::DidNavigateMainFrame(
     const content::LoadCommittedDetails& details,
     const content::FrameNavigateParams& params) {
+  if (details.is_in_page)
+    return;
+
   const std::vector<ExtensionAction*> current_actions = GetCurrentActions();

[not at google - send to devlin, 2012/08/06 22:09:19]

remind me why we clear page actions on navigation?

[Jeffrey Yasskin, 2012/08/06 22:24:25]

I believe a page action is a statement that an extension has something it can do
to the current page if the user clicks. When there's a new page, the page
action's statement might no longer be valid.

In any case, this behavior dates to the original implementation of page actions,
in r15415.

(Hah. r24654 fixed this exact bug, 3 years ago. :-(

 
   if (current_actions.empty())