Resubmit: Block content scripts from executing until user grants permission

chrome/browser/extensions/location_bar_controller.cc

 // Copyright 2014 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/location_bar_controller.h"
 
 #include "base/logging.h"
 #include "chrome/browser/extensions/active_script_controller.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/page_action_controller.h"
 #include "chrome/common/extensions/api/extension_action/action_info.h"
 #include "content/public/browser/invalidate_type.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/extension_registry.h"
 
 namespace extensions {
 
 LocationBarController::LocationBarController(
     content::WebContents* web_contents)
     : WebContentsObserver(web_contents),
       web_contents_(web_contents),
       active_script_controller_(new ActiveScriptController(web_contents_)),
-      page_action_controller_(new PageActionController(web_contents_)) {
+      page_action_controller_(new PageActionController(web_contents_)),
+      extension_registry_observer_(this) {
+  extension_registry_observer_.Add(
+      ExtensionRegistry::Get(web_contents_->GetBrowserContext()));
 }
 
 LocationBarController::~LocationBarController() {
 }
 
 std::vector<ExtensionAction*> LocationBarController::GetCurrentActions() {
   const ExtensionSet& extensions =
       ExtensionRegistry::Get(web_contents_->GetBrowserContext())
           ->enabled_extensions();
   std::vector<ExtensionAction*> current_actions;
@@ skipping 43 matching lines @@
 void LocationBarController::DidNavigateMainFrame(
     const content::LoadCommittedDetails& details,
     const content::FrameNavigateParams& params) {
   if (details.is_in_page)
     return;
 
   page_action_controller_->OnNavigated();
   active_script_controller_->OnNavigated();
 }
 
+void LocationBarController::OnExtensionUnloaded(
+    content::BrowserContext* browser_context,
+    const Extension* extension,
+    UnloadedExtensionInfo::Reason reason) {
+  bool should_update = false;
+  if (page_action_controller_->GetActionForExtension(extension)) {
+    page_action_controller_->OnExtensionUnloaded(extension);
+    should_update = true;
+  }
+  if (active_script_controller_->GetActionForExtension(extension)) {
+    active_script_controller_->OnExtensionUnloaded(extension);
+    should_update = true;
+  }
+
+  if (should_update)
+    NotifyChange(web_contents());
+}
+
 }  // namespace extensions