| 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 <map> | 5 #include <map> |
| 6 #include <string> | 6 #include <string> |
| 7 | 7 |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| 11 #include "mojo/examples/media_viewer/media_viewer.mojom.h" | 11 #include "mojo/examples/media_viewer/media_viewer.mojom.h" |
| 12 #include "mojo/public/c/system/main.h" |
| 12 #include "mojo/public/cpp/application/application_connection.h" | 13 #include "mojo/public/cpp/application/application_connection.h" |
| 13 #include "mojo/public/cpp/application/application_delegate.h" | 14 #include "mojo/public/cpp/application/application_delegate.h" |
| 14 #include "mojo/public/cpp/application/application_impl.h" | 15 #include "mojo/public/cpp/application/application_impl.h" |
| 16 #include "mojo/public/cpp/application/application_runner_chromium.h" |
| 15 #include "mojo/public/cpp/application/interface_factory_impl.h" | 17 #include "mojo/public/cpp/application/interface_factory_impl.h" |
| 16 #include "mojo/public/cpp/bindings/interface_impl.h" | 18 #include "mojo/public/cpp/bindings/interface_impl.h" |
| 17 #include "mojo/services/public/cpp/view_manager/view.h" | 19 #include "mojo/services/public/cpp/view_manager/view.h" |
| 18 #include "mojo/services/public/cpp/view_manager/view_manager.h" | 20 #include "mojo/services/public/cpp/view_manager/view_manager.h" |
| 19 #include "mojo/services/public/cpp/view_manager/view_manager_client_factory.h" | 21 #include "mojo/services/public/cpp/view_manager/view_manager_client_factory.h" |
| 20 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h" | 22 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h" |
| 21 #include "mojo/services/public/cpp/view_manager/view_observer.h" | 23 #include "mojo/services/public/cpp/view_manager/view_observer.h" |
| 22 #include "mojo/services/public/interfaces/navigation/navigation.mojom.h" | 24 #include "mojo/services/public/interfaces/navigation/navigation.mojom.h" |
| 23 #include "mojo/views/native_widget_view_manager.h" | 25 #include "mojo/views/native_widget_view_manager.h" |
| 24 #include "mojo/views/views_init.h" | 26 #include "mojo/views/views_init.h" |
| (...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 377 | 379 |
| 378 void NavigatorImpl::Navigate( | 380 void NavigatorImpl::Navigate( |
| 379 uint32_t view_id, | 381 uint32_t view_id, |
| 380 NavigationDetailsPtr navigation_details, | 382 NavigationDetailsPtr navigation_details, |
| 381 ResponseDetailsPtr response_details) { | 383 ResponseDetailsPtr response_details) { |
| 382 viewer_->Navigate(view_id, navigation_details.Pass(), | 384 viewer_->Navigate(view_id, navigation_details.Pass(), |
| 383 response_details.Pass()); | 385 response_details.Pass()); |
| 384 } | 386 } |
| 385 | 387 |
| 386 } // namespace examples | 388 } // namespace examples |
| 389 } // namespace mojo |
| 387 | 390 |
| 388 // static | 391 MojoResult MojoMain(MojoHandle shell_handle) { |
| 389 ApplicationDelegate* ApplicationDelegate::Create() { | 392 mojo::ApplicationRunnerChromium runner(new mojo::examples::MediaViewer); |
| 390 return new examples::MediaViewer; | 393 return runner.Run(shell_handle); |
| 391 } | 394 } |
| 392 | |
| 393 } // namespace mojo | |
| OLD | NEW |