| 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/macros.h" | 5 #include "base/macros.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/public/c/system/main.h" | 9 #include "mojo/public/c/system/main.h" |
| 10 #include "mojo/public/cpp/application/application_connection.h" | 10 #include "mojo/public/cpp/application/application_connection.h" |
| 11 #include "mojo/public/cpp/application/application_delegate.h" | 11 #include "mojo/public/cpp/application/application_delegate.h" |
| 12 #include "mojo/public/cpp/application/application_impl.h" | 12 #include "mojo/public/cpp/application/application_impl.h" |
| 13 #include "mojo/public/cpp/application/interface_factory_impl.h" | 13 #include "mojo/public/cpp/application/interface_factory_impl.h" |
| 14 #include "mojo/services/html_viewer/blink_platform_impl.h" | |
| 15 #include "mojo/services/html_viewer/html_document_view.h" | 14 #include "mojo/services/html_viewer/html_document_view.h" |
| 15 #include "mojo/services/html_viewer/mojo_blink_platform_impl.h" |
| 16 #include "mojo/services/html_viewer/webmediaplayer_factory.h" | 16 #include "mojo/services/html_viewer/webmediaplayer_factory.h" |
| 17 #include "mojo/services/public/interfaces/content_handler/content_handler.mojom.
h" | 17 #include "mojo/services/public/interfaces/content_handler/content_handler.mojom.
h" |
| 18 #include "third_party/WebKit/public/web/WebKit.h" | 18 #include "third_party/WebKit/public/web/WebKit.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 #include "base/path_service.h" | 22 #include "base/path_service.h" |
| 23 #include "ui/base/resource/resource_bundle.h" | 23 #include "ui/base/resource/resource_bundle.h" |
| 24 #include "ui/base/ui_base_paths.h" | 24 #include "ui/base/ui_base_paths.h" |
| 25 #endif | 25 #endif |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 class HTMLViewer : public ApplicationDelegate, | 61 class HTMLViewer : public ApplicationDelegate, |
| 62 public InterfaceFactory<ContentHandler> { | 62 public InterfaceFactory<ContentHandler> { |
| 63 public: | 63 public: |
| 64 HTMLViewer() : compositor_thread_("compositor thread") {} | 64 HTMLViewer() : compositor_thread_("compositor thread") {} |
| 65 | 65 |
| 66 ~HTMLViewer() override { blink::shutdown(); } | 66 ~HTMLViewer() override { blink::shutdown(); } |
| 67 | 67 |
| 68 private: | 68 private: |
| 69 // Overridden from ApplicationDelegate: | 69 // Overridden from ApplicationDelegate: |
| 70 void Initialize(ApplicationImpl* app) override { | 70 void Initialize(ApplicationImpl* app) override { |
| 71 blink_platform_impl_.reset(new BlinkPlatformImpl(app)); | 71 blink_platform_.reset(new MojoBlinkPlatformImpl(app)); |
| 72 blink::initialize(blink_platform_impl_.get()); | 72 blink::initialize(blink_platform_.get()); |
| 73 #if !defined(COMPONENT_BUILD) | 73 #if !defined(COMPONENT_BUILD) |
| 74 base::i18n::InitializeICU(); | 74 base::i18n::InitializeICU(); |
| 75 | 75 |
| 76 ui::RegisterPathProvider(); | 76 ui::RegisterPathProvider(); |
| 77 | 77 |
| 78 base::FilePath ui_test_pak_path; | 78 base::FilePath ui_test_pak_path; |
| 79 CHECK(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path)); | 79 CHECK(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path)); |
| 80 ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path); | 80 ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path); |
| 81 #endif | 81 #endif |
| 82 | 82 |
| (...skipping 17 matching lines...) Expand all Loading... |
| 100 | 100 |
| 101 // Overridden from InterfaceFactory<ContentHandler> | 101 // Overridden from InterfaceFactory<ContentHandler> |
| 102 void Create(ApplicationConnection* connection, | 102 void Create(ApplicationConnection* connection, |
| 103 InterfaceRequest<ContentHandler> request) override { | 103 InterfaceRequest<ContentHandler> request) override { |
| 104 BindToRequest( | 104 BindToRequest( |
| 105 new ContentHandlerImpl(compositor_thread_.message_loop_proxy(), | 105 new ContentHandlerImpl(compositor_thread_.message_loop_proxy(), |
| 106 web_media_player_factory_.get()), | 106 web_media_player_factory_.get()), |
| 107 &request); | 107 &request); |
| 108 } | 108 } |
| 109 | 109 |
| 110 scoped_ptr<BlinkPlatformImpl> blink_platform_impl_; | 110 scoped_ptr<MojoBlinkPlatformImpl> blink_platform_; |
| 111 base::Thread compositor_thread_; | 111 base::Thread compositor_thread_; |
| 112 scoped_ptr<WebMediaPlayerFactory> web_media_player_factory_; | 112 scoped_ptr<WebMediaPlayerFactory> web_media_player_factory_; |
| 113 | 113 |
| 114 DISALLOW_COPY_AND_ASSIGN(HTMLViewer); | 114 DISALLOW_COPY_AND_ASSIGN(HTMLViewer); |
| 115 }; | 115 }; |
| 116 | 116 |
| 117 } // namespace mojo | 117 } // namespace mojo |
| 118 | 118 |
| 119 MojoResult MojoMain(MojoHandle shell_handle) { | 119 MojoResult MojoMain(MojoHandle shell_handle) { |
| 120 mojo::ApplicationRunnerChromium runner(new mojo::HTMLViewer); | 120 mojo::ApplicationRunnerChromium runner(new mojo::HTMLViewer); |
| 121 return runner.Run(shell_handle); | 121 return runner.Run(shell_handle); |
| 122 } | 122 } |
| OLD | NEW |