| 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/message_loop/message_loop.h" | 5 #include "base/message_loop/message_loop.h" |
| 6 #include "base/threading/thread.h" | 6 #include "base/threading/thread.h" |
| 7 #include "mojo/application/application_runner_chromium.h" | 7 #include "mojo/application/application_runner_chromium.h" |
| 8 #include "mojo/common/tracing_impl.h" |
| 8 #include "mojo/public/c/system/main.h" | 9 #include "mojo/public/c/system/main.h" |
| 9 #include "mojo/public/cpp/application/application_connection.h" | 10 #include "mojo/public/cpp/application/application_connection.h" |
| 10 #include "mojo/public/cpp/application/application_delegate.h" | 11 #include "mojo/public/cpp/application/application_delegate.h" |
| 11 #include "mojo/public/cpp/application/application_impl.h" | 12 #include "mojo/public/cpp/application/application_impl.h" |
| 12 #include "mojo/public/cpp/application/interface_factory_impl.h" | 13 #include "mojo/public/cpp/application/interface_factory_impl.h" |
| 13 #include "mojo/services/public/interfaces/content_handler/content_handler.mojom.
h" | 14 #include "mojo/services/public/interfaces/content_handler/content_handler.mojom.
h" |
| 14 #include "sky/engine/public/web/Sky.h" | 15 #include "sky/engine/public/web/Sky.h" |
| 15 #include "sky/viewer/content_handler_impl.h" | 16 #include "sky/viewer/content_handler_impl.h" |
| 16 #include "sky/viewer/document_view.h" | 17 #include "sky/viewer/document_view.h" |
| 17 #include "sky/viewer/platform/platform_impl.h" | 18 #include "sky/viewer/platform/platform_impl.h" |
| 18 #include "sky/viewer/services/tracing_impl.h" | |
| 19 | 19 |
| 20 #if !defined(COMPONENT_BUILD) | 20 #if !defined(COMPONENT_BUILD) |
| 21 #include "base/i18n/icu_util.h" | 21 #include "base/i18n/icu_util.h" |
| 22 #endif | 22 #endif |
| 23 | 23 |
| 24 namespace sky { | 24 namespace sky { |
| 25 | 25 |
| 26 class Viewer : public mojo::ApplicationDelegate, | 26 class Viewer : public mojo::ApplicationDelegate, |
| 27 public mojo::InterfaceFactory<mojo::ContentHandler> { | 27 public mojo::InterfaceFactory<mojo::ContentHandler>, |
| 28 public mojo::InterfaceFactory<mojo::Tracing> { |
| 28 public: | 29 public: |
| 29 Viewer() {} | 30 Viewer() {} |
| 30 | 31 |
| 31 virtual ~Viewer() { blink::shutdown(); } | 32 virtual ~Viewer() { blink::shutdown(); } |
| 32 | 33 |
| 33 private: | 34 private: |
| 34 // Overridden from ApplicationDelegate: | 35 // Overridden from ApplicationDelegate: |
| 35 virtual void Initialize(mojo::ApplicationImpl* app) override { | 36 virtual void Initialize(mojo::ApplicationImpl* app) override { |
| 36 platform_impl_.reset(new PlatformImpl(app)); | 37 platform_impl_.reset(new PlatformImpl(app)); |
| 37 blink::initialize(platform_impl_.get()); | 38 blink::initialize(platform_impl_.get()); |
| 38 base::i18n::InitializeICU(); | 39 base::i18n::InitializeICU(); |
| 39 } | 40 } |
| 40 | 41 |
| 41 virtual bool ConfigureIncomingConnection( | 42 virtual bool ConfigureIncomingConnection( |
| 42 mojo::ApplicationConnection* connection) override { | 43 mojo::ApplicationConnection* connection) override { |
| 43 connection->AddService(this); | 44 connection->AddService<mojo::ContentHandler>(this); |
| 44 connection->AddService(&tracing_); | 45 connection->AddService<mojo::Tracing>(this); |
| 45 return true; | 46 return true; |
| 46 } | 47 } |
| 47 | 48 |
| 48 // Overridden from InterfaceFactory<ContentHandler> | 49 // Overridden from InterfaceFactory<ContentHandler> |
| 49 virtual void Create(mojo::ApplicationConnection* connection, | 50 virtual void Create(mojo::ApplicationConnection* connection, |
| 50 mojo::InterfaceRequest<mojo::ContentHandler> request) over
ride { | 51 mojo::InterfaceRequest<mojo::ContentHandler> request) over
ride { |
| 51 mojo::BindToRequest(new ContentHandlerImpl(), &request); | 52 mojo::BindToRequest(new ContentHandlerImpl(), &request); |
| 52 } | 53 } |
| 53 | 54 |
| 55 // Overridden from InterfaceFactory<Tracing> |
| 56 virtual void Create(mojo::ApplicationConnection* connection, |
| 57 mojo::InterfaceRequest<mojo::Tracing> request) override { |
| 58 new mojo::TracingImpl(request.Pass(), "sky_viewer"); |
| 59 } |
| 60 |
| 54 scoped_ptr<PlatformImpl> platform_impl_; | 61 scoped_ptr<PlatformImpl> platform_impl_; |
| 55 TracingFactory tracing_; | |
| 56 | 62 |
| 57 DISALLOW_COPY_AND_ASSIGN(Viewer); | 63 DISALLOW_COPY_AND_ASSIGN(Viewer); |
| 58 }; | 64 }; |
| 59 | 65 |
| 60 } // namespace mojo | 66 } // namespace mojo |
| 61 | 67 |
| 62 MojoResult MojoMain(MojoHandle shell_handle) { | 68 MojoResult MojoMain(MojoHandle shell_handle) { |
| 63 mojo::ApplicationRunnerChromium runner(new sky::Viewer); | 69 mojo::ApplicationRunnerChromium runner(new sky::Viewer); |
| 64 return runner.Run(shell_handle); | 70 return runner.Run(shell_handle); |
| 65 } | 71 } |
| OLD | NEW |