| 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" |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 class HTMLViewer; | 29 class HTMLViewer; |
| 30 | 30 |
| 31 class ContentHandlerImpl : public InterfaceImpl<ContentHandler> { | 31 class ContentHandlerImpl : public InterfaceImpl<ContentHandler> { |
| 32 public: | 32 public: |
| 33 ContentHandlerImpl(Shell* shell, | 33 ContentHandlerImpl(Shell* shell, |
| 34 scoped_refptr<base::MessageLoopProxy> compositor_thread, | 34 scoped_refptr<base::MessageLoopProxy> compositor_thread, |
| 35 WebMediaPlayerFactory* web_media_player_factory) | 35 WebMediaPlayerFactory* web_media_player_factory) |
| 36 : shell_(shell), | 36 : shell_(shell), |
| 37 compositor_thread_(compositor_thread), | 37 compositor_thread_(compositor_thread), |
| 38 web_media_player_factory_(web_media_player_factory) {} | 38 web_media_player_factory_(web_media_player_factory) {} |
| 39 virtual ~ContentHandlerImpl() {} | 39 ~ContentHandlerImpl() override {} |
| 40 | 40 |
| 41 private: | 41 private: |
| 42 // Overridden from ContentHandler: | 42 // Overridden from ContentHandler: |
| 43 virtual void OnConnect( | 43 void OnConnect( |
| 44 const mojo::String& requestor_url, | 44 const mojo::String& requestor_url, |
| 45 URLResponsePtr response, | 45 URLResponsePtr response, |
| 46 InterfaceRequest<ServiceProvider> service_provider_request) override { | 46 InterfaceRequest<ServiceProvider> service_provider_request) override { |
| 47 new HTMLDocumentView(response.Pass(), | 47 new HTMLDocumentView(response.Pass(), |
| 48 service_provider_request.Pass(), | 48 service_provider_request.Pass(), |
| 49 shell_, | 49 shell_, |
| 50 compositor_thread_, | 50 compositor_thread_, |
| 51 web_media_player_factory_); | 51 web_media_player_factory_); |
| 52 } | 52 } |
| 53 | 53 |
| 54 Shell* shell_; | 54 Shell* shell_; |
| 55 scoped_refptr<base::MessageLoopProxy> compositor_thread_; | 55 scoped_refptr<base::MessageLoopProxy> compositor_thread_; |
| 56 WebMediaPlayerFactory* web_media_player_factory_; | 56 WebMediaPlayerFactory* web_media_player_factory_; |
| 57 | 57 |
| 58 DISALLOW_COPY_AND_ASSIGN(ContentHandlerImpl); | 58 DISALLOW_COPY_AND_ASSIGN(ContentHandlerImpl); |
| 59 }; | 59 }; |
| 60 | 60 |
| 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 virtual ~HTMLViewer() { blink::shutdown(); } | 66 ~HTMLViewer() override { blink::shutdown(); } |
| 67 | 67 |
| 68 private: | 68 private: |
| 69 // Overridden from ApplicationDelegate: | 69 // Overridden from ApplicationDelegate: |
| 70 virtual void Initialize(ApplicationImpl* app) override { | 70 void Initialize(ApplicationImpl* app) override { |
| 71 shell_ = app->shell(); | 71 shell_ = app->shell(); |
| 72 blink_platform_impl_.reset(new BlinkPlatformImpl(app)); | 72 blink_platform_impl_.reset(new BlinkPlatformImpl(app)); |
| 73 blink::initialize(blink_platform_impl_.get()); | 73 blink::initialize(blink_platform_impl_.get()); |
| 74 #if !defined(COMPONENT_BUILD) | 74 #if !defined(COMPONENT_BUILD) |
| 75 base::i18n::InitializeICU(); | 75 base::i18n::InitializeICU(); |
| 76 | 76 |
| 77 ui::RegisterPathProvider(); | 77 ui::RegisterPathProvider(); |
| 78 | 78 |
| 79 base::FilePath ui_test_pak_path; | 79 base::FilePath ui_test_pak_path; |
| 80 CHECK(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path)); | 80 CHECK(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path)); |
| 81 ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path); | 81 ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path); |
| 82 #endif | 82 #endif |
| 83 | 83 |
| 84 compositor_thread_.Start(); | 84 compositor_thread_.Start(); |
| 85 web_media_player_factory_.reset(new WebMediaPlayerFactory( | 85 web_media_player_factory_.reset(new WebMediaPlayerFactory( |
| 86 compositor_thread_.message_loop_proxy())); | 86 compositor_thread_.message_loop_proxy())); |
| 87 } | 87 } |
| 88 | 88 |
| 89 virtual bool ConfigureIncomingConnection(ApplicationConnection* connection) | 89 bool ConfigureIncomingConnection(ApplicationConnection* connection) override { |
| 90 override { | |
| 91 connection->AddService(this); | 90 connection->AddService(this); |
| 92 return true; | 91 return true; |
| 93 } | 92 } |
| 94 | 93 |
| 95 // Overridden from InterfaceFactory<ContentHandler> | 94 // Overridden from InterfaceFactory<ContentHandler> |
| 96 virtual void Create(ApplicationConnection* connection, | 95 void Create(ApplicationConnection* connection, |
| 97 InterfaceRequest<ContentHandler> request) override { | 96 InterfaceRequest<ContentHandler> request) override { |
| 98 BindToRequest( | 97 BindToRequest( |
| 99 new ContentHandlerImpl(shell_, compositor_thread_.message_loop_proxy(), | 98 new ContentHandlerImpl(shell_, compositor_thread_.message_loop_proxy(), |
| 100 web_media_player_factory_.get()), | 99 web_media_player_factory_.get()), |
| 101 &request); | 100 &request); |
| 102 } | 101 } |
| 103 | 102 |
| 104 scoped_ptr<BlinkPlatformImpl> blink_platform_impl_; | 103 scoped_ptr<BlinkPlatformImpl> blink_platform_impl_; |
| 105 Shell* shell_; | 104 Shell* shell_; |
| 106 base::Thread compositor_thread_; | 105 base::Thread compositor_thread_; |
| 107 scoped_ptr<WebMediaPlayerFactory> web_media_player_factory_; | 106 scoped_ptr<WebMediaPlayerFactory> web_media_player_factory_; |
| 108 | 107 |
| 109 DISALLOW_COPY_AND_ASSIGN(HTMLViewer); | 108 DISALLOW_COPY_AND_ASSIGN(HTMLViewer); |
| 110 }; | 109 }; |
| 111 | 110 |
| 112 } // namespace mojo | 111 } // namespace mojo |
| 113 | 112 |
| 114 MojoResult MojoMain(MojoHandle shell_handle) { | 113 MojoResult MojoMain(MojoHandle shell_handle) { |
| 115 mojo::ApplicationRunnerChromium runner(new mojo::HTMLViewer); | 114 mojo::ApplicationRunnerChromium runner(new mojo::HTMLViewer); |
| 116 return runner.Run(shell_handle); | 115 return runner.Run(shell_handle); |
| 117 } | 116 } |
| OLD | NEW |