| 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 26 matching lines...) Expand all Loading... |
| 37 mojo::NetworkServicePtr network_service; | 37 mojo::NetworkServicePtr network_service; |
| 38 app->ConnectToService("mojo:network_service", &network_service); | 38 app->ConnectToService("mojo:network_service", &network_service); |
| 39 platform_impl_.reset(new PlatformImpl(network_service.Pass())); | 39 platform_impl_.reset(new PlatformImpl(network_service.Pass())); |
| 40 blink::initialize(platform_impl_.get()); | 40 blink::initialize(platform_impl_.get()); |
| 41 | 41 |
| 42 mojo::icu::Initialize(app); | 42 mojo::icu::Initialize(app); |
| 43 tracing_.Initialize(app); | 43 tracing_.Initialize(app); |
| 44 } | 44 } |
| 45 | 45 |
| 46 virtual bool ConfigureIncomingConnection( | 46 virtual bool ConfigureIncomingConnection( |
| 47 mojo::ApplicationConnection* connection) override { | 47 mojo::ApplicationConnection* connection, |
| 48 const std::string& url) override { |
| 48 connection->AddService<mojo::ContentHandler>(this); | 49 connection->AddService<mojo::ContentHandler>(this); |
| 49 return true; | 50 return true; |
| 50 } | 51 } |
| 51 | 52 |
| 52 // Overridden from InterfaceFactory<ContentHandler> | 53 // Overridden from InterfaceFactory<ContentHandler> |
| 53 virtual void Create(mojo::ApplicationConnection* connection, | 54 virtual void Create(mojo::ApplicationConnection* connection, |
| 54 mojo::InterfaceRequest<mojo::ContentHandler> request) over
ride { | 55 mojo::InterfaceRequest<mojo::ContentHandler> request) over
ride { |
| 55 new ContentHandlerImpl(request.Pass()); | 56 new ContentHandlerImpl(request.Pass()); |
| 56 } | 57 } |
| 57 | 58 |
| 58 scoped_ptr<PlatformImpl> platform_impl_; | 59 scoped_ptr<PlatformImpl> platform_impl_; |
| 59 mojo::TracingImpl tracing_; | 60 mojo::TracingImpl tracing_; |
| 60 | 61 |
| 61 DISALLOW_COPY_AND_ASSIGN(Viewer); | 62 DISALLOW_COPY_AND_ASSIGN(Viewer); |
| 62 }; | 63 }; |
| 63 | 64 |
| 64 } // namespace sky | 65 } // namespace sky |
| 65 | 66 |
| 66 MojoResult MojoMain(MojoHandle shell_handle) { | 67 MojoResult MojoMain(MojoHandle shell_handle) { |
| 67 mojo::ApplicationRunnerChromium runner(new sky::Viewer); | 68 mojo::ApplicationRunnerChromium runner(new sky::Viewer); |
| 68 return runner.Run(shell_handle); | 69 return runner.Run(shell_handle); |
| 69 } | 70 } |
| OLD | NEW |