Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1646)

Unified Diff: sky/shell/ui/engine.cc

Issue 1230113006: Remove last use of Platform::networkService() (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/shell/ui/engine.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/shell/ui/engine.cc
diff --git a/sky/shell/ui/engine.cc b/sky/shell/ui/engine.cc
index f5f42f0a18d6056f4a889af9323c2e2702ba783e..aaec2987db6d2059b0fbafa7a982e47b2e7c4337 100644
--- a/sky/shell/ui/engine.cc
+++ b/sky/shell/ui/engine.cc
@@ -62,6 +62,9 @@ Engine::Engine(const Config& config)
activity_running_(false),
have_surface_(false),
weak_factory_(this) {
+ mojo::ServiceProviderPtr service_provider =
+ CreateServiceProvider(config.service_provider_context);
+ mojo::ConnectToService(service_provider.get(), &network_service_);
}
Engine::~Engine() {
@@ -71,14 +74,9 @@ base::WeakPtr<Engine> Engine::GetWeakPtr() {
return weak_factory_.GetWeakPtr();
}
-void Engine::Init(ServiceProviderContext* service_provider_context) {
+void Engine::Init() {
TRACE_EVENT0("sky", "Engine::Init");
- mojo::ServiceProviderPtr service_provider =
- CreateServiceProvider(service_provider_context);
- mojo::NetworkServicePtr network_service;
- mojo::ConnectToService(service_provider.get(), &network_service);
-
DCHECK(!g_platform_impl);
g_platform_impl = new PlatformImpl();
blink::initialize(g_platform_impl);
@@ -175,7 +173,7 @@ void Engine::RunFromSnapshotStream(
void Engine::RunFromNetwork(const mojo::String& url) {
dart_library_provider_.reset(
- new DartLibraryProviderNetwork(g_platform_impl->networkService()));
+ new DartLibraryProviderNetwork(network_service_.get()));
RunFromLibrary(url);
}
« no previous file with comments | « sky/shell/ui/engine.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698