| Index: sky/engine/core/script/dart_controller.h
|
| diff --git a/sky/engine/core/script/dart_controller.h b/sky/engine/core/script/dart_controller.h
|
| index 7d7347cdc34eb7729ce84b8dffe7ae2b8b3367a2..bff9f29c7afb18f3b8485a3aa17d4d5df7e04413 100644
|
| --- a/sky/engine/core/script/dart_controller.h
|
| +++ b/sky/engine/core/script/dart_controller.h
|
| @@ -18,7 +18,8 @@ namespace blink {
|
| class AbstractModule;
|
| class BuiltinSky;
|
| class DOMDartState;
|
| -class DartLibraryProviderNetwork;
|
| +class DartLibraryProvider;
|
| +class DartLibraryProviderWebView;
|
| class DartSnapshotLoader;
|
| class DartValue;
|
| class HTMLScriptElement;
|
| @@ -35,10 +36,11 @@ class DartController {
|
| typedef base::Callback<void(RefPtr<AbstractModule>, RefPtr<DartValue>)>
|
| LoadFinishedCallback;
|
|
|
| - // Can either issue the url load ourselves or take an existing response:
|
| - void LoadMainLibrary(const KURL& url, mojo::URLResponsePtr response = nullptr);
|
| void LoadSnapshot(const KURL& url, mojo::URLResponsePtr response = nullptr);
|
|
|
| + void RunFromLibrary(const String& name,
|
| + DartLibraryProvider* library_provider);
|
| +
|
| void LoadScriptInModule(AbstractModule* module,
|
| const String& source,
|
| const TextPosition& textPosition,
|
| @@ -59,12 +61,12 @@ class DartController {
|
| const String& source,
|
| const TextPosition& position);
|
|
|
| - void DidLoadMainLibrary(KURL url);
|
| + void DidLoadMainLibrary(String url);
|
| void DidLoadSnapshot();
|
|
|
| OwnPtr<DOMDartState> dom_dart_state_;
|
| OwnPtr<BuiltinSky> builtin_sky_;
|
| - OwnPtr<DartLibraryProviderNetwork> library_provider_;
|
| + OwnPtr<DartLibraryProviderWebView> library_provider_;
|
| OwnPtr<DartSnapshotLoader> snapshot_loader_;
|
|
|
| base::WeakPtrFactory<DartController> weak_factory_;
|
|
|