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 "base/files/file_path.h" | 5 #include "base/files/file_path.h" |
6 #include "base/message_loop/message_loop.h" | 6 #include "base/message_loop/message_loop.h" |
7 #include "base/threading/thread.h" | 7 #include "base/threading/thread.h" |
8 #include "mojo/application/application_runner_chromium.h" | 8 #include "mojo/application/application_runner_chromium.h" |
9 #include "mojo/common/tracing_impl.h" | 9 #include "mojo/common/tracing_impl.h" |
10 #include "mojo/icu/icu.h" | 10 #include "mojo/icu/icu.h" |
(...skipping 20 matching lines...) Expand all Loading... |
31 | 31 |
32 private: | 32 private: |
33 // Overridden from ApplicationDelegate: | 33 // Overridden from ApplicationDelegate: |
34 virtual void Initialize(mojo::ApplicationImpl* app) override { | 34 virtual void Initialize(mojo::ApplicationImpl* app) override { |
35 RuntimeFlags::Initialize(app); | 35 RuntimeFlags::Initialize(app); |
36 | 36 |
37 platform_impl_.reset(new PlatformImpl(app)); | 37 platform_impl_.reset(new PlatformImpl(app)); |
38 blink::initialize(platform_impl_.get()); | 38 blink::initialize(platform_impl_.get()); |
39 | 39 |
40 mojo::icu::Initialize(app); | 40 mojo::icu::Initialize(app); |
41 mojo::TracingImpl::Create(app); | 41 tracing_.Initialize(app); |
42 } | 42 } |
43 | 43 |
44 virtual bool ConfigureIncomingConnection( | 44 virtual bool ConfigureIncomingConnection( |
45 mojo::ApplicationConnection* connection) override { | 45 mojo::ApplicationConnection* connection) override { |
46 connection->AddService<mojo::ContentHandler>(this); | 46 connection->AddService<mojo::ContentHandler>(this); |
47 return true; | 47 return true; |
48 } | 48 } |
49 | 49 |
50 // Overridden from InterfaceFactory<ContentHandler> | 50 // Overridden from InterfaceFactory<ContentHandler> |
51 virtual void Create(mojo::ApplicationConnection* connection, | 51 virtual void Create(mojo::ApplicationConnection* connection, |
52 mojo::InterfaceRequest<mojo::ContentHandler> request) over
ride { | 52 mojo::InterfaceRequest<mojo::ContentHandler> request) over
ride { |
53 mojo::BindToRequest(new ContentHandlerImpl(), &request); | 53 mojo::BindToRequest(new ContentHandlerImpl(), &request); |
54 } | 54 } |
55 | 55 |
56 scoped_ptr<PlatformImpl> platform_impl_; | 56 scoped_ptr<PlatformImpl> platform_impl_; |
| 57 mojo::TracingImpl tracing_; |
57 | 58 |
58 DISALLOW_COPY_AND_ASSIGN(Viewer); | 59 DISALLOW_COPY_AND_ASSIGN(Viewer); |
59 }; | 60 }; |
60 | 61 |
61 } // namespace mojo | 62 } // namespace sky |
62 | 63 |
63 MojoResult MojoMain(MojoHandle shell_handle) { | 64 MojoResult MojoMain(MojoHandle shell_handle) { |
64 mojo::ApplicationRunnerChromium runner(new sky::Viewer); | 65 mojo::ApplicationRunnerChromium runner(new sky::Viewer); |
65 return runner.Run(shell_handle); | 66 return runner.Run(shell_handle); |
66 } | 67 } |
OLD | NEW |