| Index: gin/modules/module_runner_delegate.h
|
| diff --git a/gin/modules/module_runner_delegate.h b/gin/modules/module_runner_delegate.h
|
| index 3ce056f250a98be8fd438047ad2b5b2332058946..09d4582dd76684ac420619104e6426f7de25203c 100644
|
| --- a/gin/modules/module_runner_delegate.h
|
| +++ b/gin/modules/module_runner_delegate.h
|
| @@ -10,7 +10,7 @@
|
| #include "base/compiler_specific.h"
|
| #include "gin/gin_export.h"
|
| #include "gin/modules/file_module_provider.h"
|
| -#include "gin/runner.h"
|
| +#include "gin/shell_runner.h"
|
|
|
| namespace gin {
|
|
|
| @@ -19,7 +19,7 @@ typedef v8::Local<v8::Value> (*ModuleGetter)(v8::Isolate* isolate);
|
| // Emebedders that use AMD modules will probably want to use a RunnerDelegate
|
| // that inherits from ModuleRunnerDelegate. ModuleRunnerDelegate lets embedders
|
| // register built-in modules and routes module requests to FileModuleProvider.
|
| -class GIN_EXPORT ModuleRunnerDelegate : public RunnerDelegate {
|
| +class GIN_EXPORT ModuleRunnerDelegate : public ShellRunnerDelegate {
|
| public:
|
| explicit ModuleRunnerDelegate(
|
| const std::vector<base::FilePath>& search_paths);
|
| @@ -33,11 +33,12 @@ class GIN_EXPORT ModuleRunnerDelegate : public RunnerDelegate {
|
| private:
|
| typedef std::map<std::string, ModuleGetter> BuiltinModuleMap;
|
|
|
| - // From RunnerDelegate:
|
| + // From ShellRunnerDelegate:
|
| virtual v8::Handle<v8::ObjectTemplate> GetGlobalTemplate(
|
| - Runner* runner) OVERRIDE;
|
| - virtual void DidCreateContext(Runner* runner) OVERRIDE;
|
| - virtual void DidRunScript(Runner* runner) OVERRIDE;
|
| + ShellRunner* runner,
|
| + v8::Isolate* isolate) OVERRIDE;
|
| + virtual void DidCreateContext(ShellRunner* runner) OVERRIDE;
|
| + virtual void DidRunScript(ShellRunner* runner) OVERRIDE;
|
|
|
| BuiltinModuleMap builtin_modules_;
|
| FileModuleProvider module_provider_;
|
|
|