[Mojo] Remove static "bootstrap" state in mojo_js

gin/modules/module_registry.h

 // Copyright 2013 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.
 
 #ifndef GIN_MODULES_MODULE_REGISTRY_H_
 #define GIN_MODULES_MODULE_REGISTRY_H_
 
 #include <list>
+#include <map>
 #include <set>
 #include <string>
 
+#include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "gin/per_context_data.h"
 
 namespace gin {
 
 struct PendingModule;
 
+typedef base::Callback<void (v8::Handle<v8::Value>)> ModuleLoadCallback;

[Aaron Boodman, 2013/11/27 19:02:41]

Does this need to be namespace scoped?

[Aaron Boodman, 2013/11/27 19:02:41]

Nit: The general style in Chrome is for non-primitive input params to be const&.
It doesn't matter too much for a handle, which is probably around the same size
as a pointer, but I'm a sucker for consistency.

[Aaron Boodman, 2013/11/27 19:02:41]

Nit: LoadModuleCallback, for parallelism with LoadModule() ?

[abarth-chromium, 2013/11/27 19:18:09]

Done.

[abarth-chromium, 2013/11/27 19:18:09]

v8::Handles are just pointers to pointers.  Having a const reference to a
v8::Handle is then a pointer to a pointer to a pointer...  I can do that if you
like, but it seems unnecessary.

[abarth-chromium, 2013/11/27 19:18:09]

Done.

+
 // This class implements the Asynchronous Module Definition (AMD) API.
 // https://github.com/amdjs/amdjs-api/wiki/AMD
 //
 // Our implementation isn't complete yet. Missing features:
 //   1) Built-in support for require, exports, and module.
 //   2) Path resoltuion in module names.
 //
 // For these reasons, we don't have an "amd" property on the "define"
 // function. The spec says we should only add that property once our
 // implementation complies with the specification.
 //
 class ModuleRegistry : public ContextSupplement {
  public:
   virtual ~ModuleRegistry();
 
   static ModuleRegistry* From(v8::Handle<v8::Context> context);
 
   static void RegisterGlobals(v8::Isolate* isolate,
                               v8::Handle<v8::ObjectTemplate> templ);
 
   // The caller must have already entered our context.
   void AddBuiltinModule(v8::Isolate* isolate,
                         const std::string& id,
                         v8::Handle<v8::ObjectTemplate> templ);
 
   // The caller must have already entered our context.
   void AddPendingModule(v8::Isolate* isolate,
                         scoped_ptr<PendingModule> pending);
 
+  void LoadModule(v8::Isolate* isolate,
+                  const std::string& id,
+                  ModuleLoadCallback callback);
+
   // The caller must have already entered our context.
   void AttemptToLoadMoreModules(v8::Isolate* isolate);
 
   const std::set<std::string>& available_modules() const {
     return available_modules_;
   }
 
   const std::set<std::string>& unsatisfied_dependencies() const {
     return unsatisfied_dependencies_;
   }
 
  private:
   typedef ScopedVector<PendingModule> PendingModuleVector;
+  typedef std::map<std::string, ModuleLoadCallback> ModuleLoadCallbackMap;
 
   explicit ModuleRegistry(v8::Isolate* isolate);
 
   // From ContextSupplement:
   virtual void Detach(v8::Handle<v8::Context> context) OVERRIDE;
 
   void Load(v8::Isolate* isolate, scoped_ptr<PendingModule> pending);
   void RegisterModule(v8::Isolate* isolate,
                       const std::string& id,
                       v8::Handle<v8::Value> module);
 
   bool CheckDependencies(PendingModule* pending);
   bool AttemptToLoad(v8::Isolate* isolate, scoped_ptr<PendingModule> pending);
 
+  v8::Handle<v8::Value> GetModule(v8::Isolate* isolate, const std::string& id);
+
   std::set<std::string> available_modules_;
   std::set<std::string> unsatisfied_dependencies_;
 
+  ModuleLoadCallbackMap waiting_callbacks_;
+
   PendingModuleVector pending_modules_;
   v8::Persistent<v8::Object> modules_;
 
   DISALLOW_COPY_AND_ASSIGN(ModuleRegistry);
 };
 
 }  // namespace gin
 
 #endif  // GIN_MODULES_MODULE_REGISTRY_H_