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/macros.h" | 6 #include "base/macros.h" |
7 #include "base/message_loop/message_loop.h" | 7 #include "base/message_loop/message_loop.h" |
8 #include "base/strings/stringprintf.h" | 8 #include "base/strings/stringprintf.h" |
9 #include "examples/bitmap_uploader/bitmap_uploader.h" | 9 #include "examples/bitmap_uploader/bitmap_uploader.h" |
10 #include "examples/window_manager/window_manager.mojom.h" | 10 #include "examples/window_manager/window_manager.mojom.h" |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
94 Shell* shell_; | 94 Shell* shell_; |
95 IWindowManagerPtr window_manager_; | 95 IWindowManagerPtr window_manager_; |
96 scoped_ptr<BitmapUploader> bitmap_uploader_; | 96 scoped_ptr<BitmapUploader> bitmap_uploader_; |
97 | 97 |
98 DISALLOW_COPY_AND_ASSIGN(NestingApp); | 98 DISALLOW_COPY_AND_ASSIGN(NestingApp); |
99 }; | 99 }; |
100 | 100 |
101 } // namespace examples | 101 } // namespace examples |
102 } // namespace mojo | 102 } // namespace mojo |
103 | 103 |
104 MojoResult MojoMain(MojoHandle shell_handle) { | 104 MojoResult MojoMain(MojoHandle application_request) { |
105 mojo::ApplicationRunnerChromium runner(new mojo::examples::NestingApp); | 105 mojo::ApplicationRunnerChromium runner(new mojo::examples::NestingApp); |
106 return runner.Run(shell_handle); | 106 return runner.Run(application_request); |
107 } | 107 } |
OLD | NEW |