| 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 "mojo/shell/view_manager_loader.h" | 5 #include "mojo/shell/view_manager_loader.h" |
| 6 | 6 |
| 7 #include "mojo/public/cpp/shell/application.h" | 7 #include "mojo/public/cpp/shell/application.h" |
| 8 #include "mojo/services/view_manager/root_node_manager.h" | 8 #include "mojo/services/view_manager/root_node_manager.h" |
| 9 #include "mojo/services/view_manager/view_manager_connection.h" | 9 #include "mojo/services/view_manager/view_manager_connection.h" |
| 10 | 10 |
| 11 namespace mojo { | 11 namespace mojo { |
| 12 namespace shell { | 12 namespace shell { |
| 13 | 13 |
| 14 ViewManagerLoader::ViewManagerLoader() { | 14 ViewManagerLoader::ViewManagerLoader() { |
| 15 } | 15 } |
| 16 | 16 |
| 17 ViewManagerLoader::~ViewManagerLoader() { | 17 ViewManagerLoader::~ViewManagerLoader() { |
| 18 } | 18 } |
| 19 | 19 |
| 20 void ViewManagerLoader::LoadService(ServiceManager* manager, | 20 void ViewManagerLoader::LoadService(ServiceManager* manager, |
| 21 const GURL& url, | 21 const GURL& url, |
| 22 ScopedMessagePipeHandle shell_handle) { | 22 ScopedMessagePipeHandle shell_handle) { |
| 23 scoped_ptr<Application> app(new Application(shell_handle.Pass())); | 23 scoped_ptr<Application> app(new Application(shell_handle.Pass())); |
| 24 if (!root_node_manager_.get()) { | 24 if (!root_node_manager_.get()) { |
| 25 root_node_manager_.reset( | 25 root_node_manager_.reset( |
| 26 new view_manager::service::RootNodeManager(app->shell())); | 26 new view_manager::service::RootNodeManager(app->shell())); |
| 27 } | 27 } |
| 28 app->AddServiceConnector( | 28 app->AddService<view_manager::service::ViewManagerConnection>( |
| 29 new ServiceConnector<view_manager::service::ViewManagerConnection, | 29 root_node_manager_.get()); |
| 30 view_manager::service::RootNodeManager>( | |
| 31 root_node_manager_.get())); | |
| 32 apps_.push_back(app.release()); | 30 apps_.push_back(app.release()); |
| 33 } | 31 } |
| 34 | 32 |
| 35 void ViewManagerLoader::OnServiceError(ServiceManager* manager, | 33 void ViewManagerLoader::OnServiceError(ServiceManager* manager, |
| 36 const GURL& url) { | 34 const GURL& url) { |
| 37 } | 35 } |
| 38 | 36 |
| 39 } // namespace shell | 37 } // namespace shell |
| 40 } // namespace mojo | 38 } // namespace mojo |
| OLD | NEW |