EFD now notifies EPM of renderviews created, which in turn notifies the renderer of page actions that it knows about.

Remove generic event "page-action-executed" in favor of page action specific event (sent as extension_id/page_action_id).

In the bindings, we now setup events for each page action we know about so we can register for specific events, and not receive broadcast events from all page actions. To setup these events I added a GetCurrentPageActions() to extension_process_bindings.cc and a helper function GetCurrentExtensionId().

And, finally, I simplified the page action background page by removing the check to see if we are already subscribed to the feed (since we now support multiple feed readers, it doesn't make sense anymore to always check Google Reader). This check might make a comeback later in a different form.

BUG=13936
TEST=The RSS sample extension should work as before.
Review URL: http://codereview.chromium.org/155514

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20714 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 53 insertions, 3 deletions

diff --git a/chrome/renderer/extensions/extension_process_bindings.cc b/chrome/renderer/extensions/extension_process_bindings.cc
index e68fb82..49b12b9 100644
--- a/chrome/renderer/extensions/extension_process_bindings.cc
+++ b/chrome/renderer/extensions/extension_process_bindings.cc
@@ -25,6 +25,9 @@ using bindings_utils::ExtensionBase;
 
 namespace {
 
+// A map of extension ID to vector of page action ids.
+typedef std::map< std::string, std::vector<std::string> > PageActionIdMap;
+
 const char kExtensionName[] = "chrome/ExtensionProcessBindings";
 const char* kExtensionDeps[] = {
   BaseJsV8Extension::kName,
@@ -35,12 +38,17 @@ const char* kExtensionDeps[] = {
 
 struct SingletonData {
   std::set<std::string> function_names_;
+  PageActionIdMap page_action_ids_;
 };
 
 static std::set<std::string>* GetFunctionNameSet() {
   return &Singleton<SingletonData>()->function_names_;
 }
 
+static PageActionIdMap* GetPageActionMap() {
+  return &Singleton<SingletonData>()->page_action_ids_;
+}
+
 class ExtensionImpl : public ExtensionBase {
  public:
   ExtensionImpl() : ExtensionBase(
@@ -62,6 +70,8 @@ class ExtensionImpl : public ExtensionBase {
       return v8::FunctionTemplate::New(GetViews);
     } else if (name->Equals(v8::String::New("GetNextRequestId"))) {
       return v8::FunctionTemplate::New(GetNextRequestId);
+    } else if (name->Equals(v8::String::New("GetCurrentPageActions"))) {
+      return v8::FunctionTemplate::New(GetCurrentPageActions);
     } else if (names->find(*v8::String::AsciiValue(name)) != names->end()) {
       return v8::FunctionTemplate::New(StartRequest, name);
     }
@@ -70,11 +80,15 @@ class ExtensionImpl : public ExtensionBase {
   }
 
  private:
-  static v8::Handle<v8::Value> GetViews(const v8::Arguments& args) {
+  static std::string ExtensionIdFromCurrentContext() {
     RenderView* renderview = bindings_utils::GetRenderViewForCurrentContext();
     DCHECK(renderview);
     GURL url = renderview->webview()->GetMainFrame()->GetURL();
-    std::string extension_id = url.host();
+    return url.host();
+  }
+
+  static v8::Handle<v8::Value> GetViews(const v8::Arguments& args) {
+    std::string extension_id = ExtensionIdFromCurrentContext();
 
     ContextList contexts =
         bindings_utils::GetContextsForExtension(extension_id);
@@ -97,7 +111,30 @@ class ExtensionImpl : public ExtensionBase {
     static int next_request_id = 0;
     return v8::Integer::New(next_request_id++);
   }
-  
+
+  static v8::Handle<v8::Value> GetCurrentPageActions(
+      const v8::Arguments& args) {
+    std::string extension_id = ExtensionIdFromCurrentContext();
+    PageActionIdMap* page_action_map = GetPageActionMap();
+    PageActionIdMap::const_iterator it = page_action_map->find(extension_id);
+
+    const std::vector<std::string>* page_actions = NULL;
+    size_t size  = 0;
+    if (it != page_action_map->end()) {
+      page_actions = &it->second;
+      size = page_actions->size();
+    }
+
+    v8::Local<v8::Array> page_action_array = v8::Array::New(size);
+    for (size_t i = 0; i < size; ++i) {
+      const std::string& page_action_id = (*page_actions)[i];
+      page_action_array->Set(v8::Integer::New(i),
+                              v8::String::New(page_action_id.c_str()));
+    }
+
+    return page_action_array;
+  }
+
   // Starts an API request to the browser, with an optional callback.  The
   // callback will be dispatched to EventBindings::HandleResponse.
   static v8::Handle<v8::Value> StartRequest(const v8::Arguments& args) {
@@ -159,3 +196,16 @@ void ExtensionProcessBindings::HandleResponse(int request_id, bool success,
 
   GetPendingRequestMap().erase(request_id);
 }
+
+// static
+void ExtensionProcessBindings::SetPageActions(
+    const std::string& extension_id,
+    const std::vector<std::string>& page_actions) {
+  PageActionIdMap& page_action_map = *GetPageActionMap();
+  if (!page_actions.empty()) {
+    page_action_map[extension_id] = page_actions;
+  } else {
+    if (page_action_map.find(extension_id) != page_action_map.end())
+      page_action_map.erase(extension_id);
+  }
+}