Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2934)

Unified Diff: chrome/browser/extensions/active_script_controller.cc

Issue 508563003: Remove PageActionsController (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/active_script_controller.cc
diff --git a/chrome/browser/extensions/active_script_controller.cc b/chrome/browser/extensions/active_script_controller.cc
index 3cda93e9e76cf5a6fb74ff3ecab21ec6a16e491b..80c7fbdc5e93c015b6465199dcad964694ca4a81 100644
--- a/chrome/browser/extensions/active_script_controller.cc
+++ b/chrome/browser/extensions/active_script_controller.cc
@@ -22,6 +22,7 @@
#include "chrome/common/extensions/api/extension_action/action_info.h"
#include "components/crx_file/id_util.h"
#include "content/public/browser/navigation_controller.h"
+#include "content/public/browser/navigation_details.h"
#include "content/public/browser/navigation_entry.h"
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/web_contents.h"
@@ -168,12 +169,6 @@ ExtensionAction* ActiveScriptController::GetActionForExtension(
return action.get();
}
-void ActiveScriptController::OnNavigated() {
- LogUMA();
- permitted_extensions_.clear();
- pending_requests_.clear();
-}
-
void ActiveScriptController::OnExtensionUnloaded(const Extension* extension) {
PendingRequestMap::iterator iter = pending_requests_.find(extension->id());
if (iter != pending_requests_.end())
@@ -355,4 +350,15 @@ void ActiveScriptController::LogUMA() const {
}
}
+void ActiveScriptController::DidNavigateMainFrame(
+ const content::LoadCommittedDetails& details,
+ const content::FrameNavigateParams& params) {
+ if (details.is_in_page)
+ return;
+
+ LogUMA();
+ permitted_extensions_.clear();
+ pending_requests_.clear();
+}
+
} // namespace extensions

Powered by Google App Engine
This is Rietveld 408576698