| 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/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/logging.h" | 6 #include "base/logging.h" |
| 7 #include "base/macros.h" | 7 #include "base/macros.h" |
| 8 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
| 9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
| 10 #include "base/threading/thread.h" | 10 #include "base/threading/thread.h" |
| (...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 193 &request); | 193 &request); |
| 194 } | 194 } |
| 195 | 195 |
| 196 scoped_ptr<MojoBlinkPlatformImpl> blink_platform_; | 196 scoped_ptr<MojoBlinkPlatformImpl> blink_platform_; |
| 197 base::Thread compositor_thread_; | 197 base::Thread compositor_thread_; |
| 198 scoped_ptr<WebMediaPlayerFactory> web_media_player_factory_; | 198 scoped_ptr<WebMediaPlayerFactory> web_media_player_factory_; |
| 199 | 199 |
| 200 DISALLOW_COPY_AND_ASSIGN(HTMLViewer); | 200 DISALLOW_COPY_AND_ASSIGN(HTMLViewer); |
| 201 }; | 201 }; |
| 202 | 202 |
| 203 } // namespace html_viewer |
| 204 |
| 203 MojoResult MojoMain(MojoHandle shell_handle) { | 205 MojoResult MojoMain(MojoHandle shell_handle) { |
| 204 mojo::ApplicationRunnerChromium runner(new HTMLViewer); | 206 mojo::ApplicationRunnerChromium runner(new html_viewer::HTMLViewer); |
| 205 return runner.Run(shell_handle); | 207 return runner.Run(shell_handle); |
| 206 } | 208 } |
| 207 | |
| 208 } // namespace html_viewer | |
| OLD | NEW |