| 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 "examples/wm_flow/wm/frame_controller.h" | 5 #include "examples/wm_flow/wm/frame_controller.h" |
| 6 #include "mojo/application/application_runner_chromium.h" | 6 #include "mojo/application/application_runner_chromium.h" |
| 7 #include "mojo/public/c/system/main.h" | 7 #include "mojo/public/c/system/main.h" |
| 8 #include "mojo/public/cpp/application/application_delegate.h" | 8 #include "mojo/public/cpp/application/application_delegate.h" |
| 9 #include "mojo/public/cpp/application/application_impl.h" | 9 #include "mojo/public/cpp/application/application_impl.h" |
| 10 #include "mojo/public/cpp/application/service_provider_impl.h" | 10 #include "mojo/public/cpp/application/service_provider_impl.h" |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 116 mojo::View* root_; | 116 mojo::View* root_; |
| 117 mojo::View* window_container_; | 117 mojo::View* window_container_; |
| 118 | 118 |
| 119 gfx::Point next_window_origin_; | 119 gfx::Point next_window_origin_; |
| 120 | 120 |
| 121 DISALLOW_COPY_AND_ASSIGN(SimpleWM); | 121 DISALLOW_COPY_AND_ASSIGN(SimpleWM); |
| 122 }; | 122 }; |
| 123 | 123 |
| 124 } // namespace examples | 124 } // namespace examples |
| 125 | 125 |
| 126 MojoResult MojoMain(MojoHandle shell_handle) { | 126 MojoResult MojoMain(MojoHandle application_request) { |
| 127 mojo::ApplicationRunnerChromium runner(new examples::SimpleWM); | 127 mojo::ApplicationRunnerChromium runner(new examples::SimpleWM); |
| 128 return runner.Run(shell_handle); | 128 return runner.Run(application_request); |
| 129 } | 129 } |
| OLD | NEW |