Introduce ActiveScriptController; track active extension scripts

chrome/browser/extensions/api/extension_action/extension_action_api.cc

Index: chrome/browser/extensions/api/extension_action/extension_action_api.cc
diff --git a/chrome/browser/extensions/api/extension_action/extension_action_api.cc b/chrome/browser/extensions/api/extension_action/extension_action_api.cc
index 3b552b3cd30ea21b014c1c5073317db540926b07..d4e65784f712b9bc6eed0c10b2a90c8b590fdc9b 100644
--- a/chrome/browser/extensions/api/extension_action/extension_action_api.cc
+++ b/chrome/browser/extensions/api/extension_action/extension_action_api.cc
@@ -398,6 +398,9 @@ void ExtensionActionAPI::ExtensionActionExecuted(
     case ActionInfo::TYPE_SYSTEM_INDICATOR:
       // The System Indicator handles its own clicks.
       break;
+    case ActionInfo::TYPE_ACTIVE_SCRIPT:
+      NOTREACHED();  // We shouldn't get these calls (yet).

[not at google - send to devlin, 2014/05/08 20:47:09]

even if we did I don't think we'll ever expose an API for them. so the "yet"
might be a little misleading :)

[Devlin, 2014/05/08 23:01:00]

Actually, since PageActions and ActiveScriptActions have to be able to be
combined now, we don't even use the new type. Removed.

+      return;
   }
 
   if (event_name) {
@@ -620,6 +623,9 @@ void ExtensionActionFunction::NotifyChange() {
     case ActionInfo::TYPE_SYSTEM_INDICATOR:
       NotifySystemIndicatorChange();
       return;
+    case ActionInfo::TYPE_ACTIVE_SCRIPT:
+      NOTREACHED();  // We shouldn't get these calls (yet).
+      return;
   }
   NOTREACHED();
 }
@@ -632,8 +638,7 @@ void ExtensionActionFunction::NotifyBrowserActionChange() {
 }
 
 void ExtensionActionFunction::NotifyLocationBarChange() {
-  TabHelper::FromWebContents(contents_)->
-      location_bar_controller()->NotifyChange();
+  LocationBarController::NotifyChange(contents_);
 }
 
 void ExtensionActionFunction::NotifySystemIndicatorChange() {
@@ -909,8 +914,7 @@ bool PageActionsFunction::SetPageActionEnabled(bool enable) {
   // Set visibility and broadcast notifications that the UI should be updated.
   page_action->SetIsVisible(tab_id, enable);
   page_action->SetTitle(tab_id, title);
-  extensions::TabHelper::FromWebContents(contents)->
-      location_bar_controller()->NotifyChange();
+  extensions::LocationBarController::NotifyChange(contents);
 
   return true;
 }