| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "mojo/application/application_runner_chromium.h" | 5 #include "mojo/application/application_runner_chromium.h" |
| 6 #include "mojo/public/c/system/main.h" | 6 #include "mojo/public/c/system/main.h" |
| 7 #include "sky/viewer/content_handler_impl.h" | 7 #include "mojo/public/cpp/application/application_connection.h" |
| 8 #include "mojo/public/cpp/application/application_delegate.h" |
| 9 #include "mojo/public/cpp/application/application_impl.h" |
| 10 #include "mojo/public/cpp/application/interface_factory_impl.h" |
| 11 #include "mojo/services/content_handler/public/interfaces/content_handler.mojom.
h" |
| 12 #include "services/sky_packaged_app_viewer/content_handler_impl.h" |
| 8 #include "sky/viewer/sky_viewer_base.h" | 13 #include "sky/viewer/sky_viewer_base.h" |
| 9 | 14 |
| 10 namespace sky { | 15 namespace sky_packaged_app_viewer { |
| 11 | 16 |
| 12 class Viewer : public SkyViewerBase { | 17 class Viewer : public sky::SkyViewerBase { |
| 13 public: | 18 public: |
| 14 Viewer() {} | 19 Viewer() {} |
| 15 | 20 |
| 16 ~Viewer() override {} | 21 ~Viewer() override {} |
| 17 | 22 |
| 18 private: | 23 private: |
| 19 // Overridden from InterfaceFactory<ContentHandler> | 24 // Overridden from InterfaceFactory<ContentHandler> |
| 20 void Create(mojo::ApplicationConnection* connection, | 25 void Create(mojo::ApplicationConnection* connection, |
| 21 mojo::InterfaceRequest<mojo::ContentHandler> request) override { | 26 mojo::InterfaceRequest<mojo::ContentHandler> request) override { |
| 22 new ContentHandlerImpl(request.Pass()); | 27 new ContentHandlerImpl(request.Pass()); |
| 23 } | 28 } |
| 24 | 29 |
| 25 DISALLOW_COPY_AND_ASSIGN(Viewer); | 30 DISALLOW_COPY_AND_ASSIGN(Viewer); |
| 26 }; | 31 }; |
| 27 | 32 |
| 28 } // namespace sky | 33 } // namespace sky_packaged_app_viewer |
| 29 | 34 |
| 30 MojoResult MojoMain(MojoHandle application_request) { | 35 MojoResult MojoMain(MojoHandle application_request) { |
| 31 mojo::ApplicationRunnerChromium runner(new sky::Viewer); | 36 mojo::ApplicationRunnerChromium runner(new sky_packaged_app_viewer::Viewer); |
| 32 return runner.Run(application_request); | 37 return runner.Run(application_request); |
| 33 } | 38 } |
| OLD | NEW |