Revert 125801 - Implement a module system for the extension bindings JS.

chrome/renderer/extensions/miscellaneous_bindings.cc

 // 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/miscellaneous_bindings.h"
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 44 matching lines @@
 
 static ExtensionData::PortData& GetPortData(int port_id) {
   return g_extension_data.Get().ports[port_id];
 }
 
 static void ClearPortData(int port_id) {
   g_extension_data.Get().ports.erase(port_id);
 }
 
 const char kPortClosedError[] = "Attempting to use a disconnected port object";
+const char* kExtensionDeps[] = { "extensions/event.js" };
 
 class ExtensionImpl : public ChromeV8Extension {
  public:
   explicit ExtensionImpl(ExtensionDispatcher* dispatcher)
-      : ChromeV8Extension(dispatcher) {
-    RouteStaticFunction("CloseChannel", &CloseChannel);
-    RouteStaticFunction("PortAddRef", &PortAddRef);
-    RouteStaticFunction("PortRelease", &PortRelease);
-    RouteStaticFunction("PostMessage", &PostMessage);
+      : ChromeV8Extension("extensions/miscellaneous_bindings.js",
+                          IDR_MISCELLANEOUS_BINDINGS_JS,
+                          arraysize(kExtensionDeps), kExtensionDeps,
+                          dispatcher) {
   }
+  ~ExtensionImpl() {}
 
-  ~ExtensionImpl() {}
+  virtual v8::Handle<v8::FunctionTemplate> GetNativeFunction(
+      v8::Handle<v8::String> name) {
+    if (name->Equals(v8::String::New("PostMessage"))) {
+      return v8::FunctionTemplate::New(PostMessage);
+    } else if (name->Equals(v8::String::New("CloseChannel"))) {
+      return v8::FunctionTemplate::New(CloseChannel);
+    } else if (name->Equals(v8::String::New("PortAddRef"))) {
+      return v8::FunctionTemplate::New(PortAddRef);
+    } else if (name->Equals(v8::String::New("PortRelease"))) {
+      return v8::FunctionTemplate::New(PortRelease);
+    }
+    return ChromeV8Extension::GetNativeFunction(name);
+  }
 
   // Sends a message along the given channel.
   static v8::Handle<v8::Value> PostMessage(const v8::Arguments& args) {
     content::RenderView* renderview = GetCurrentRenderView();
     if (!renderview)
       return v8::Undefined();
 
     if (args.Length() >= 2 && args[0]->IsInt32() && args[1]->IsString()) {
       int port_id = args[0]->Int32Value();
       if (!HasPortData(port_id)) {
@@ skipping 48 matching lines @@
       }
     }
     return v8::Undefined();
   }
 };
 
 }  // namespace
 
 namespace extensions {
 
-ChromeV8Extension* MiscellaneousBindings::Get(ExtensionDispatcher* dispatcher) {
-  return new ExtensionImpl(dispatcher);
+v8::Extension* MiscellaneousBindings::Get(ExtensionDispatcher* dispatcher) {
+  static v8::Extension* extension = new ExtensionImpl(dispatcher);
+  return extension;
 }
 
 void MiscellaneousBindings::DeliverMessage(
     const ChromeV8ContextSet::ContextSet& contexts,
     int target_port_id,
     const std::string& message,
     content::RenderView* restrict_to_render_view) {
   v8::HandleScope handle_scope;
 
   for (ChromeV8ContextSet::ContextSet::const_iterator it = contexts.begin();
@@ skipping 21 matching lines @@
     arguments.push_back(v8::String::New(message.c_str(), message.size()));
     arguments.push_back(port_id_handle);
     CHECK((*it)->CallChromeHiddenMethod("Port.dispatchOnMessage",
                                         arguments.size(),
                                         &arguments[0],
                                         NULL));
   }
 }
 
 }  // namespace extension