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/c/system/main.h" |
10 #include "mojo/public/cpp/application/application_connection.h" | 11 #include "mojo/public/cpp/application/application_connection.h" |
11 #include "mojo/public/cpp/application/application_delegate.h" | 12 #include "mojo/public/cpp/application/application_delegate.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/view.h" | 18 #include "mojo/services/public/cpp/view_manager/view.h" |
17 #include "mojo/services/public/cpp/view_manager/view_manager.h" | 19 #include "mojo/services/public/cpp/view_manager/view_manager.h" |
18 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h" | 20 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h" |
19 #include "mojo/services/public/cpp/view_manager/view_observer.h" | 21 #include "mojo/services/public/cpp/view_manager/view_observer.h" |
20 #include "mojo/services/public/cpp/view_manager/window_manager_delegate.h" | 22 #include "mojo/services/public/cpp/view_manager/window_manager_delegate.h" |
21 #include "mojo/services/public/interfaces/input_events/input_events.mojom.h" | 23 #include "mojo/services/public/interfaces/input_events/input_events.mojom.h" |
22 #include "mojo/services/public/interfaces/launcher/launcher.mojom.h" | 24 #include "mojo/services/public/interfaces/launcher/launcher.mojom.h" |
(...skipping 530 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
553 } | 555 } |
554 | 556 |
555 void NavigatorHostImpl::RequestNavigate( | 557 void NavigatorHostImpl::RequestNavigate( |
556 uint32 source_view_id, | 558 uint32 source_view_id, |
557 Target target, | 559 Target target, |
558 NavigationDetailsPtr nav_details) { | 560 NavigationDetailsPtr nav_details) { |
559 window_manager_->RequestNavigate(source_view_id, target, nav_details.Pass()); | 561 window_manager_->RequestNavigate(source_view_id, target, nav_details.Pass()); |
560 } | 562 } |
561 | 563 |
562 } // namespace examples | 564 } // namespace examples |
| 565 } // namespace mojo |
563 | 566 |
564 // static | 567 MojoResult MojoMain(MojoHandle shell_handle) { |
565 ApplicationDelegate* ApplicationDelegate::Create() { | 568 mojo::ApplicationRunnerChromium runner(new mojo::examples::WindowManager); |
566 return new examples::WindowManager; | 569 return runner.Run(shell_handle); |
567 } | 570 } |
568 | |
569 } // namespace mojo | |
OLD | NEW |