| 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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 47 mojo::ServiceProviderImpl* exported_services, | 47 mojo::ServiceProviderImpl* exported_services, |
| 48 scoped_ptr<mojo::ServiceProvider> imported_services) override { | 48 scoped_ptr<mojo::ServiceProvider> imported_services) override { |
| 49 root_ = root; | 49 root_ = root; |
| 50 } | 50 } |
| 51 void OnViewManagerDisconnected(ViewManager* view_manager) override {} | 51 void OnViewManagerDisconnected(ViewManager* view_manager) override {} |
| 52 | 52 |
| 53 // Overridden from WindowManagerDelegate: | 53 // Overridden from WindowManagerDelegate: |
| 54 void Embed( | 54 void Embed( |
| 55 const mojo::String& url, | 55 const mojo::String& url, |
| 56 mojo::InterfaceRequest<mojo::ServiceProvider> service_provider) override { | 56 mojo::InterfaceRequest<mojo::ServiceProvider> service_provider) override { |
| 57 View* view = View::Create(root_->view_manager()); | 57 View* view = root_->view_manager()->CreateView(); |
| 58 root_->AddChild(view); | 58 root_->AddChild(view); |
| 59 view->SetVisible(true); | 59 view->SetVisible(true); |
| 60 view->Embed(url, scoped_ptr<mojo::ServiceProviderImpl>( | 60 view->Embed(url, scoped_ptr<mojo::ServiceProviderImpl>( |
| 61 new mojo::ServiceProviderImpl).Pass()); | 61 new mojo::ServiceProviderImpl).Pass()); |
| 62 } | 62 } |
| 63 | 63 |
| 64 scoped_ptr<WindowManagerApp> window_manager_app_; | 64 scoped_ptr<WindowManagerApp> window_manager_app_; |
| 65 | 65 |
| 66 View* root_; | 66 View* root_; |
| 67 | 67 |
| 68 MOJO_DISALLOW_COPY_AND_ASSIGN(DefaultWindowManager); | 68 MOJO_DISALLOW_COPY_AND_ASSIGN(DefaultWindowManager); |
| 69 }; | 69 }; |
| 70 | 70 |
| 71 } // namespace window_manager | 71 } // namespace window_manager |
| 72 | 72 |
| 73 MojoResult MojoMain(MojoHandle shell_handle) { | 73 MojoResult MojoMain(MojoHandle shell_handle) { |
| 74 mojo::ApplicationRunnerChromium runner( | 74 mojo::ApplicationRunnerChromium runner( |
| 75 new window_manager::DefaultWindowManager); | 75 new window_manager::DefaultWindowManager); |
| 76 return runner.Run(shell_handle); | 76 return runner.Run(shell_handle); |
| 77 } | 77 } |
| OLD | NEW |