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/viewer/platform/platform_impl.h" |
6 | 6 |
7 #include <cmath> | 7 #include <cmath> |
8 | 8 |
9 #include "base/debug/trace_event.h" | 9 #include "base/debug/trace_event.h" |
10 #include "base/rand_util.h" | 10 #include "base/rand_util.h" |
(...skipping 28 matching lines...) Expand all Loading... |
39 | 39 |
40 } // namespace | 40 } // namespace |
41 | 41 |
42 PlatformImpl::PlatformImpl(mojo::ApplicationImpl* app) | 42 PlatformImpl::PlatformImpl(mojo::ApplicationImpl* app) |
43 : main_loop_(base::MessageLoop::current()), | 43 : main_loop_(base::MessageLoop::current()), |
44 main_thread_task_runner_(base::MessageLoop::current()->task_runner()), | 44 main_thread_task_runner_(base::MessageLoop::current()->task_runner()), |
45 shared_timer_func_(NULL), | 45 shared_timer_func_(NULL), |
46 shared_timer_fire_time_(0.0), | 46 shared_timer_fire_time_(0.0), |
47 shared_timer_fire_time_was_set_while_suspended_(false), | 47 shared_timer_fire_time_was_set_while_suspended_(false), |
48 shared_timer_suspended_(0) { | 48 shared_timer_suspended_(0) { |
49 app->ConnectToService("mojo://network_service/", &network_service_); | 49 app->ConnectToService("mojo:network_service", &network_service_); |
50 | 50 |
51 mojo::CookieStorePtr cookie_store; | 51 mojo::CookieStorePtr cookie_store; |
52 network_service_->GetCookieStore(GetProxy(&cookie_store)); | 52 network_service_->GetCookieStore(GetProxy(&cookie_store)); |
53 } | 53 } |
54 | 54 |
55 PlatformImpl::~PlatformImpl() { | 55 PlatformImpl::~PlatformImpl() { |
56 } | 56 } |
57 | 57 |
58 blink::WebMimeRegistry* PlatformImpl::mimeRegistry() { | 58 blink::WebMimeRegistry* PlatformImpl::mimeRegistry() { |
59 return &mime_registry_; | 59 return &mime_registry_; |
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
233 const unsigned char* category_group_enabled, | 233 const unsigned char* category_group_enabled, |
234 const char* name, | 234 const char* name, |
235 TraceEventHandle handle) { | 235 TraceEventHandle handle) { |
236 base::debug::TraceEventHandle traceEventHandle; | 236 base::debug::TraceEventHandle traceEventHandle; |
237 memcpy(&traceEventHandle, &handle, sizeof(handle)); | 237 memcpy(&traceEventHandle, &handle, sizeof(handle)); |
238 TRACE_EVENT_API_UPDATE_TRACE_EVENT_DURATION( | 238 TRACE_EVENT_API_UPDATE_TRACE_EVENT_DURATION( |
239 category_group_enabled, name, traceEventHandle); | 239 category_group_enabled, name, traceEventHandle); |
240 } | 240 } |
241 | 241 |
242 } // namespace sky | 242 } // namespace sky |
OLD | NEW |