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

Side by Side Diff: sky/shell/ui/engine.cc

Issue 1239633002: Remove //sky/engine/platform/network (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: rebase 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 unified diff | Download patch
« no previous file with comments | « sky/services/platform/weburlloader_impl.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "sky/shell/ui/engine.h" 5 #include "sky/shell/ui/engine.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/threading/worker_pool.h" 9 #include "base/threading/worker_pool.h"
10 #include "base/trace_event/trace_event.h" 10 #include "base/trace_event/trace_event.h"
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 73
74 void Engine::Init(ServiceProviderContext* service_provider_context) { 74 void Engine::Init(ServiceProviderContext* service_provider_context) {
75 TRACE_EVENT0("sky", "Engine::Init"); 75 TRACE_EVENT0("sky", "Engine::Init");
76 76
77 mojo::ServiceProviderPtr service_provider = 77 mojo::ServiceProviderPtr service_provider =
78 CreateServiceProvider(service_provider_context); 78 CreateServiceProvider(service_provider_context);
79 mojo::NetworkServicePtr network_service; 79 mojo::NetworkServicePtr network_service;
80 mojo::ConnectToService(service_provider.get(), &network_service); 80 mojo::ConnectToService(service_provider.get(), &network_service);
81 81
82 DCHECK(!g_platform_impl); 82 DCHECK(!g_platform_impl);
83 g_platform_impl = new PlatformImpl(network_service.Pass()); 83 g_platform_impl = new PlatformImpl();
84 blink::initialize(g_platform_impl); 84 blink::initialize(g_platform_impl);
85 } 85 }
86 86
87 void Engine::BeginFrame(base::TimeTicks frame_time) { 87 void Engine::BeginFrame(base::TimeTicks frame_time) {
88 TRACE_EVENT0("sky", "Engine::BeginFrame"); 88 TRACE_EVENT0("sky", "Engine::BeginFrame");
89 89
90 if (sky_view_) 90 if (sky_view_)
91 sky_view_->BeginFrame(frame_time); 91 sky_view_->BeginFrame(frame_time);
92 } 92 }
93 93
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 244
245 void Engine::DidNavigateLocally(const mojo::String& url) { 245 void Engine::DidNavigateLocally(const mojo::String& url) {
246 } 246 }
247 247
248 void Engine::RequestNavigateHistory(int32_t delta) { 248 void Engine::RequestNavigateHistory(int32_t delta) {
249 NOTIMPLEMENTED(); 249 NOTIMPLEMENTED();
250 } 250 }
251 251
252 } // namespace shell 252 } // namespace shell
253 } // namespace sky 253 } // namespace sky
OLDNEW
« no previous file with comments | « sky/services/platform/weburlloader_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698