| 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 <algorithm> | 5 #include <algorithm> |
| 6 | 6 |
| 7 #include "base/macros.h" | 7 #include "base/macros.h" |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
| 10 #include "base/strings/string_tokenizer.h" | 10 #include "base/strings/string_tokenizer.h" |
| (...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 216 } | 216 } |
| 217 | 217 |
| 218 ContentHandlerFactory content_handler_factory_; | 218 ContentHandlerFactory content_handler_factory_; |
| 219 | 219 |
| 220 DISALLOW_COPY_AND_ASSIGN(PNGViewer); | 220 DISALLOW_COPY_AND_ASSIGN(PNGViewer); |
| 221 }; | 221 }; |
| 222 | 222 |
| 223 } // namespace examples | 223 } // namespace examples |
| 224 } // namespace mojo | 224 } // namespace mojo |
| 225 | 225 |
| 226 MojoResult MojoMain(MojoHandle shell_handle) { | 226 MojoResult MojoMain(MojoHandle application_request) { |
| 227 mojo::ApplicationRunnerChromium runner(new mojo::examples::PNGViewer()); | 227 mojo::ApplicationRunnerChromium runner(new mojo::examples::PNGViewer()); |
| 228 return runner.Run(shell_handle); | 228 return runner.Run(application_request); |
| 229 } | 229 } |
| OLD | NEW |