| 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/i18n/icu_util.h" | 5 #include "base/i18n/icu_util.h" |
| 6 #include "gin/array_buffer.h" | 6 #include "gin/array_buffer.h" |
| 7 #include "gin/public/isolate_holder.h" | 7 #include "gin/public/isolate_holder.h" |
| 8 #include "mojo/application/content_handler_factory.h" | 8 #include "mojo/application/content_handler_factory.h" |
| 9 #include "mojo/environment/scoped_chromium_init.h" |
| 9 #include "mojo/public/c/system/main.h" | 10 #include "mojo/public/c/system/main.h" |
| 10 #include "mojo/public/cpp/application/application_impl_base.h" | 11 #include "mojo/public/cpp/application/application_impl_base.h" |
| 11 #include "mojo/public/cpp/application/run_application.h" | 12 #include "mojo/public/cpp/application/run_application.h" |
| 12 #include "services/js/js_app.h" | 13 #include "services/js/js_app.h" |
| 13 | 14 |
| 14 namespace js { | 15 namespace js { |
| 15 | 16 |
| 16 class JsContentHandler : public mojo::ApplicationImplBase, | 17 class JsContentHandler : public mojo::ApplicationImplBase, |
| 17 public mojo::ContentHandlerFactory::ManagedDelegate { | 18 public mojo::ContentHandlerFactory::ManagedDelegate { |
| 18 public: | 19 public: |
| (...skipping 25 matching lines...) Expand all Loading... |
| 44 return make_scoped_ptr( | 45 return make_scoped_ptr( |
| 45 new JSApp(application_request.Pass(), response.Pass())); | 46 new JSApp(application_request.Pass(), response.Pass())); |
| 46 } | 47 } |
| 47 | 48 |
| 48 DISALLOW_COPY_AND_ASSIGN(JsContentHandler); | 49 DISALLOW_COPY_AND_ASSIGN(JsContentHandler); |
| 49 }; | 50 }; |
| 50 | 51 |
| 51 } // namespace js | 52 } // namespace js |
| 52 | 53 |
| 53 MojoResult MojoMain(MojoHandle application_request) { | 54 MojoResult MojoMain(MojoHandle application_request) { |
| 55 mojo::ScopedChromiumInit init; |
| 54 js::JsContentHandler js_content_handler; | 56 js::JsContentHandler js_content_handler; |
| 55 return mojo::RunMainApplication(application_request, &js_content_handler); | 57 return mojo::RunApplication(application_request, &js_content_handler); |
| 56 } | 58 } |
| OLD | NEW |