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

chrome/browser/extensions/page_action_controller.cc

 // 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.
 
 #include "chrome/browser/extensions/page_action_controller.h"
 
 #include "chrome/browser/extensions/browser_event_router.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #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"
 
 namespace extensions {
 
 PageActionController::PageActionController(TabContents* tab_contents)
     : content::WebContentsObserver(tab_contents->web_contents()),
       tab_contents_(tab_contents) {}
 
 PageActionController::~PageActionController() {}
@@ skipping 52 matching lines @@
 }
 
 void PageActionController::NotifyChange() {
   tab_contents_->web_contents()->NotifyNavigationStateChanged(
       content::INVALIDATE_TYPE_PAGE_ACTIONS);
 }
 
 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())
     return;
 
   for (size_t i = 0; i < current_actions.size(); ++i) {
     current_actions[i]->ClearAllValuesForTab(
         SessionID::IdForTab(tab_contents_));
   }
 
   NotifyChange();
 }
 
 ExtensionService* PageActionController::GetExtensionService() const {
   return ExtensionSystem::Get(tab_contents_->profile())->extension_service();
 }
 
 }  // namespace extensions