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/memory/scoped_ptr.h" | 5 #include "base/memory/scoped_ptr.h" |
6 #include "mojo/application/application_runner_chromium.h" | 6 #include "mojo/application/application_runner_chromium.h" |
7 #include "mojo/common/tracing_impl.h" | 7 #include "mojo/common/tracing_impl.h" |
8 #include "mojo/public/c/system/main.h" | 8 #include "mojo/public/c/system/main.h" |
9 #include "mojo/public/cpp/application/application_delegate.h" | 9 #include "mojo/public/cpp/application/application_delegate.h" |
10 #include "mojo/public/cpp/application/service_provider_impl.h" | 10 #include "mojo/public/cpp/application/service_provider_impl.h" |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
78 | 78 |
79 View* root_; | 79 View* root_; |
80 int window_offset_; | 80 int window_offset_; |
81 mojo::TracingImpl tracing_; | 81 mojo::TracingImpl tracing_; |
82 | 82 |
83 MOJO_DISALLOW_COPY_AND_ASSIGN(DefaultWindowManager); | 83 MOJO_DISALLOW_COPY_AND_ASSIGN(DefaultWindowManager); |
84 }; | 84 }; |
85 | 85 |
86 } // namespace window_manager | 86 } // namespace window_manager |
87 | 87 |
88 MojoResult MojoMain(MojoHandle shell_handle) { | 88 MojoResult MojoMain(MojoHandle application_request) { |
89 mojo::ApplicationRunnerChromium runner( | 89 mojo::ApplicationRunnerChromium runner( |
90 new window_manager::DefaultWindowManager); | 90 new window_manager::DefaultWindowManager); |
91 return runner.Run(shell_handle); | 91 return runner.Run(application_request); |
92 } | 92 } |
OLD | NEW |