| 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/files/file_path.h" | 5 #include "base/files/file_path.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/common/tracing_impl.h" | 9 #include "mojo/common/tracing_impl.h" |
| 10 #include "mojo/icu/icu.h" | 10 #include "mojo/icu/icu.h" |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 } | 56 } |
| 57 | 57 |
| 58 scoped_ptr<PlatformImpl> platform_impl_; | 58 scoped_ptr<PlatformImpl> platform_impl_; |
| 59 mojo::TracingImpl tracing_; | 59 mojo::TracingImpl tracing_; |
| 60 | 60 |
| 61 DISALLOW_COPY_AND_ASSIGN(Viewer); | 61 DISALLOW_COPY_AND_ASSIGN(Viewer); |
| 62 }; | 62 }; |
| 63 | 63 |
| 64 } // namespace sky | 64 } // namespace sky |
| 65 | 65 |
| 66 MojoResult MojoMain(MojoHandle shell_handle) { | 66 MojoResult MojoMain(MojoHandle application_request) { |
| 67 mojo::ApplicationRunnerChromium runner(new sky::Viewer); | 67 mojo::ApplicationRunnerChromium runner(new sky::Viewer); |
| 68 return runner.Run(shell_handle); | 68 return runner.Run(application_request); |
| 69 } | 69 } |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1058163002:
Replaces |shell_handle| with |application_request| as the name of the parameter to MojoMain(). (Closed)
Base URL: https://github.com/domokit/mojo.git@master