Refactor: cleanup declarative_api.cc.

extensions/renderer/resources/event.js

 // 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.
 
   var exceptionHandler = require('uncaught_exception_handler');
   var eventNatives = requireNative('event_natives');
   var logging = requireNative('logging');
   var schemaRegistry = requireNative('schema_registry');
   var sendRequest = require('sendRequest').sendRequest;
   var utils = require('utils');
@@ skipping 55 matching lines @@
 
   // Handles adding/removing/dispatching listeners for unfiltered events.
   var UnfilteredAttachmentStrategy = function(event) {
     this.event_ = event;
   };
 
   UnfilteredAttachmentStrategy.prototype.onAddedListener =
       function(listener) {
     // Only attach / detach on the first / last listener removed.
     if (this.event_.listeners.length == 0)
-      eventNatives.AttachEvent(this.event_.eventName);
+      eventNatives.AttachEvent(
+          this.event_.eventName, this.event_.webViewInstanceId);
   };
 
   UnfilteredAttachmentStrategy.prototype.onRemovedListener =
       function(listener) {
     if (this.event_.listeners.length == 0)
       this.detach(true);
   };
 
   UnfilteredAttachmentStrategy.prototype.detach = function(manual) {
     eventNatives.DetachEvent(this.event_.eventName, manual);
@@ skipping 430 matching lines @@
     'removeRules',
     'getRules'
   ] });
 
   // NOTE: Event is (lazily) exposed as chrome.Event from dispatcher.cc.
   exports.Event = Event;
 
   exports.dispatchEvent = dispatchEvent;
   exports.parseEventOptions = parseEventOptions;
   exports.registerArgumentMassager = registerArgumentMassager;