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/message_loop/message_loop.h" | 5 #include "base/message_loop/message_loop.h" |
| 6 #include "mojo/public/c/system/main.h" |
6 #include "mojo/public/cpp/application/application_connection.h" | 7 #include "mojo/public/cpp/application/application_connection.h" |
7 #include "mojo/public/cpp/application/application_delegate.h" | 8 #include "mojo/public/cpp/application/application_delegate.h" |
8 #include "mojo/public/cpp/application/application_impl.h" | 9 #include "mojo/public/cpp/application/application_impl.h" |
| 10 #include "mojo/public/cpp/application/application_runner_chromium.h" |
9 #include "mojo/public/cpp/application/interface_factory_impl.h" | 11 #include "mojo/public/cpp/application/interface_factory_impl.h" |
10 #include "mojo/services/html_viewer/blink_platform_impl.h" | 12 #include "mojo/services/html_viewer/blink_platform_impl.h" |
11 #include "mojo/services/html_viewer/html_document_view.h" | 13 #include "mojo/services/html_viewer/html_document_view.h" |
12 #include "mojo/services/public/cpp/view_manager/types.h" | 14 #include "mojo/services/public/cpp/view_manager/types.h" |
13 #include "mojo/services/public/cpp/view_manager/view.h" | 15 #include "mojo/services/public/cpp/view_manager/view.h" |
14 #include "mojo/services/public/cpp/view_manager/view_manager.h" | 16 #include "mojo/services/public/cpp/view_manager/view_manager.h" |
15 #include "mojo/services/public/cpp/view_manager/view_manager_client_factory.h" | 17 #include "mojo/services/public/cpp/view_manager/view_manager_client_factory.h" |
16 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h" | 18 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h" |
17 #include "mojo/services/public/interfaces/navigation/navigation.mojom.h" | 19 #include "mojo/services/public/interfaces/navigation/navigation.mojom.h" |
18 #include "third_party/WebKit/public/web/WebKit.h" | 20 #include "third_party/WebKit/public/web/WebKit.h" |
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
103 DISALLOW_COPY_AND_ASSIGN(HTMLViewer); | 105 DISALLOW_COPY_AND_ASSIGN(HTMLViewer); |
104 }; | 106 }; |
105 | 107 |
106 void NavigatorImpl::Navigate( | 108 void NavigatorImpl::Navigate( |
107 uint32_t view_id, | 109 uint32_t view_id, |
108 NavigationDetailsPtr navigation_details, | 110 NavigationDetailsPtr navigation_details, |
109 ResponseDetailsPtr response_details) { | 111 ResponseDetailsPtr response_details) { |
110 viewer_->Load(response_details.Pass()); | 112 viewer_->Load(response_details.Pass()); |
111 } | 113 } |
112 | 114 |
113 // static | 115 } // namespace mojo |
114 ApplicationDelegate* ApplicationDelegate::Create() { | 116 |
115 return new HTMLViewer; | 117 MojoResult MojoMain(MojoHandle shell_handle) { |
| 118 mojo::ApplicationRunnerChromium runner(new mojo::HTMLViewer); |
| 119 return runner.Run(shell_handle); |
116 } | 120 } |
117 | |
118 } | |
OLD | NEW |