Unrevert again r119770 - "Event pages: remember events that the page registered for,""

chrome/renderer/extensions/event_bindings.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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/renderer/extensions/event_bindings.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/lazy_instance.h"
 #include "base/message_loop.h"
@@ skipping 72 matching lines @@
           v8_extension->extension_dispatcher()->v8_context_set();
       ChromeV8Context* context = context_set.GetCurrent();
       CHECK(context);
       EventListenerCounts& listener_counts =
           GetListenerCounts(context->extension_id());
       std::string event_name(*v8::String::AsciiValue(args[0]));
 
       if (!v8_extension->CheckCurrentContextAccessToExtensionAPI(event_name))
         return v8::Undefined();
 
+      const ::Extension* extension = v8_extension->extension_dispatcher()->
+          extensions()->GetByID(context->extension_id());
+
       if (++listener_counts[event_name] == 1) {
         content::RenderThread::Get()->Send(
             new ExtensionHostMsg_AddListener(context->extension_id(),
                                              event_name));
+        // TODO(mpcomplete): restrict this to the bg page only.
+        // TODO(mpcomplete): figure out proper time to call RemoveLazyListener.
+        if (extension && !extension->background_page_persists()) {
+          content::RenderThread::Get()->Send(
+              new ExtensionHostMsg_AddLazyListener(context->extension_id(),
+                                                   event_name));
+        }
       }
     }
 
     return v8::Undefined();
   }
 
   static v8::Handle<v8::Value> DetachEvent(const v8::Arguments& args) {
     DCHECK(args.Length() == 1);
     // TODO(erikkay) should enforce that event name is a string in the bindings
     DCHECK(args[0]->IsString() || args[0]->IsUndefined());
 
     if (args[0]->IsString()) {
       ExtensionImpl* v8_extension = GetFromArguments<ExtensionImpl>(args);
       const ChromeV8ContextSet& context_set =
           v8_extension->extension_dispatcher()->v8_context_set();
       ChromeV8Context* context = context_set.GetCurrent();
       if (!context)
         return v8::Undefined();
 
       EventListenerCounts& listener_counts =
           GetListenerCounts(context->extension_id());
       std::string event_name(*v8::String::AsciiValue(args[0]));
+
       if (--listener_counts[event_name] == 0) {
         content::RenderThread::Get()->Send(
             new ExtensionHostMsg_RemoveListener(context->extension_id(),
                                                 event_name));
       }
     }
 
     return v8::Undefined();
   }
 };
 
 }  // namespace
 
 v8::Extension* EventBindings::Get(ExtensionDispatcher* dispatcher) {
   static v8::Extension* extension = new ExtensionImpl(dispatcher);
   return extension;
 }