| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/viewer/platform/platform_impl.h" | 5 #include "sky/services/platform/platform_impl.h" |
| 6 | 6 |
| 7 #include "mojo/public/cpp/application/application_impl.h" | 7 #include "sky/services/platform/net_constants.h" |
| 8 #include "sky/viewer/platform/net_constants.h" | 8 #include "sky/services/platform/weburlloader_impl.h" |
| 9 #include "sky/viewer/platform/weburlloader_impl.h" | |
| 10 | 9 |
| 11 namespace sky { | 10 namespace sky { |
| 12 | 11 |
| 13 PlatformImpl::PlatformImpl(mojo::ApplicationImpl* app) | 12 PlatformImpl::PlatformImpl(mojo::NetworkServicePtr network_service) |
| 14 : main_thread_task_runner_(base::MessageLoop::current()->task_runner()) { | 13 : main_thread_task_runner_(base::MessageLoop::current()->task_runner()) { |
| 15 app->ConnectToService("mojo:network_service", &network_service_); | 14 network_service_ = network_service.Pass(); |
| 16 } | 15 } |
| 17 | 16 |
| 18 PlatformImpl::~PlatformImpl() { | 17 PlatformImpl::~PlatformImpl() { |
| 19 } | 18 } |
| 20 | 19 |
| 21 blink::WebString PlatformImpl::defaultLocale() { | 20 blink::WebString PlatformImpl::defaultLocale() { |
| 22 return blink::WebString::fromUTF8("en-US"); | 21 return blink::WebString::fromUTF8("en-US"); |
| 23 } | 22 } |
| 24 | 23 |
| 25 base::SingleThreadTaskRunner* PlatformImpl::mainThreadTaskRunner() { | 24 base::SingleThreadTaskRunner* PlatformImpl::mainThreadTaskRunner() { |
| (...skipping 13 matching lines...) Expand all Loading... |
| 39 blink::WebURLError error; | 38 blink::WebURLError error; |
| 40 error.domain = blink::WebString::fromUTF8(kNetErrorDomain); | 39 error.domain = blink::WebString::fromUTF8(kNetErrorDomain); |
| 41 error.reason = kNetErrorAborted; | 40 error.reason = kNetErrorAborted; |
| 42 error.unreachableURL = url; | 41 error.unreachableURL = url; |
| 43 error.staleCopyInCache = false; | 42 error.staleCopyInCache = false; |
| 44 error.isCancellation = true; | 43 error.isCancellation = true; |
| 45 return error; | 44 return error; |
| 46 } | 45 } |
| 47 | 46 |
| 48 } // namespace sky | 47 } // namespace sky |
| OLD | NEW |