| 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/basictypes.h" | 5 #include "base/basictypes.h" |
| 6 #include "base/bind.h" | 6 #include "base/bind.h" |
| 7 #include "mojo/examples/keyboard/keyboard.mojom.h" | 7 #include "mojo/examples/keyboard/keyboard.mojom.h" |
| 8 #include "mojo/examples/window_manager/debug_panel.h" | 8 #include "mojo/examples/window_manager/debug_panel.h" |
| 9 #include "mojo/examples/window_manager/window_manager.mojom.h" | 9 #include "mojo/examples/window_manager/window_manager.mojom.h" |
| 10 #include "mojo/public/cpp/application/application_connection.h" | 10 #include "mojo/public/cpp/application/application_connection.h" |
| 11 #include "mojo/public/cpp/application/application_delegate.h" | 11 #include "mojo/public/cpp/application/application_delegate.h" |
| 12 #include "mojo/public/cpp/application/application_export.h" |
| 12 #include "mojo/public/cpp/application/application_impl.h" | 13 #include "mojo/public/cpp/application/application_impl.h" |
| 14 #include "mojo/public/cpp/application/application_runner_chromium.h" |
| 13 #include "mojo/public/cpp/application/interface_factory_impl.h" | 15 #include "mojo/public/cpp/application/interface_factory_impl.h" |
| 14 #include "mojo/services/public/cpp/geometry/geometry_type_converters.h" | 16 #include "mojo/services/public/cpp/geometry/geometry_type_converters.h" |
| 15 #include "mojo/services/public/cpp/input_events/input_events_type_converters.h" | 17 #include "mojo/services/public/cpp/input_events/input_events_type_converters.h" |
| 16 #include "mojo/services/public/cpp/view_manager/node.h" | 18 #include "mojo/services/public/cpp/view_manager/node.h" |
| 17 #include "mojo/services/public/cpp/view_manager/node_observer.h" | 19 #include "mojo/services/public/cpp/view_manager/node_observer.h" |
| 18 #include "mojo/services/public/cpp/view_manager/view.h" | 20 #include "mojo/services/public/cpp/view_manager/view.h" |
| 19 #include "mojo/services/public/cpp/view_manager/view_manager.h" | 21 #include "mojo/services/public/cpp/view_manager/view_manager.h" |
| 20 #include "mojo/services/public/cpp/view_manager/view_manager_client_factory.h" | 22 #include "mojo/services/public/cpp/view_manager/view_manager_client_factory.h" |
| 21 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h" | 23 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h" |
| 22 #include "mojo/services/public/cpp/view_manager/window_manager_delegate.h" | 24 #include "mojo/services/public/cpp/view_manager/window_manager_delegate.h" |
| (...skipping 520 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 543 } | 545 } |
| 544 | 546 |
| 545 void NavigatorHostImpl::RequestNavigate( | 547 void NavigatorHostImpl::RequestNavigate( |
| 546 uint32 source_node_id, | 548 uint32 source_node_id, |
| 547 Target target, | 549 Target target, |
| 548 NavigationDetailsPtr nav_details) { | 550 NavigationDetailsPtr nav_details) { |
| 549 window_manager_->RequestNavigate(source_node_id, target, nav_details.Pass()); | 551 window_manager_->RequestNavigate(source_node_id, target, nav_details.Pass()); |
| 550 } | 552 } |
| 551 | 553 |
| 552 } // namespace examples | 554 } // namespace examples |
| 555 } // namespace mojo |
| 553 | 556 |
| 554 // static | 557 extern "C" APPLICATION_EXPORT MojoResult CDECL MojoMain( |
| 555 ApplicationDelegate* ApplicationDelegate::Create() { | 558 MojoHandle shell_handle) { |
| 556 return new examples::WindowManager; | 559 return mojo::ApplicationRunnerChromium(make_scoped_delegate( |
| 560 new mojo::examples::WindowManager)).Run(shell_handle); |
| 557 } | 561 } |
| 558 | |
| 559 } // namespace mojo | |
| OLD | NEW |