| 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/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
| 10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
| 11 #include "base/strings/utf_string_conversions.h" | 11 #include "base/strings/utf_string_conversions.h" |
| 12 #include "components/html_viewer/html_document.h" | 12 #include "components/html_viewer/html_document.h" |
| 13 #include "components/html_viewer/setup.h" | 13 #include "components/html_viewer/setup.h" |
| 14 #include "mojo/application/application_runner_chromium.h" | |
| 15 #include "mojo/application/public/cpp/application_connection.h" | 14 #include "mojo/application/public/cpp/application_connection.h" |
| 16 #include "mojo/application/public/cpp/application_delegate.h" | 15 #include "mojo/application/public/cpp/application_delegate.h" |
| 17 #include "mojo/application/public/cpp/application_impl.h" | 16 #include "mojo/application/public/cpp/application_impl.h" |
| 17 #include "mojo/application/public/cpp/application_runner.h" |
| 18 #include "mojo/application/public/cpp/connect.h" | 18 #include "mojo/application/public/cpp/connect.h" |
| 19 #include "mojo/application/public/cpp/interface_factory_impl.h" | 19 #include "mojo/application/public/cpp/interface_factory_impl.h" |
| 20 #include "mojo/application/public/interfaces/content_handler.mojom.h" | 20 #include "mojo/application/public/interfaces/content_handler.mojom.h" |
| 21 #include "mojo/common/common_type_converters.h" | 21 #include "mojo/common/common_type_converters.h" |
| 22 #include "mojo/services/network/public/interfaces/network_service.mojom.h" | 22 #include "mojo/services/network/public/interfaces/network_service.mojom.h" |
| 23 #include "third_party/WebKit/public/web/WebKit.h" | 23 #include "third_party/WebKit/public/web/WebKit.h" |
| 24 #include "third_party/mojo/src/mojo/public/c/system/main.h" | 24 #include "third_party/mojo/src/mojo/public/c/system/main.h" |
| 25 #include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" | 25 #include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" |
| 26 | 26 |
| 27 using mojo::ApplicationConnection; | 27 using mojo::ApplicationConnection; |
| (...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 } | 154 } |
| 155 | 155 |
| 156 scoped_ptr<Setup> setup_; | 156 scoped_ptr<Setup> setup_; |
| 157 | 157 |
| 158 DISALLOW_COPY_AND_ASSIGN(HTMLViewer); | 158 DISALLOW_COPY_AND_ASSIGN(HTMLViewer); |
| 159 }; | 159 }; |
| 160 | 160 |
| 161 } // namespace html_viewer | 161 } // namespace html_viewer |
| 162 | 162 |
| 163 MojoResult MojoMain(MojoHandle shell_handle) { | 163 MojoResult MojoMain(MojoHandle shell_handle) { |
| 164 mojo::ApplicationRunnerChromium runner(new html_viewer::HTMLViewer); | 164 mojo::ApplicationRunner runner(new html_viewer::HTMLViewer); |
| 165 return runner.Run(shell_handle); | 165 return runner.Run(shell_handle); |
| 166 } | 166 } |
| OLD | NEW |