| 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/application/application_connection.h" | 7 #include "mojo/public/cpp/application/application_connection.h" |
| 8 #include "mojo/public/cpp/application/application_impl.h" | 8 #include "mojo/public/cpp/application/application_impl.h" |
| 9 #include "mojo/services/view_manager/view_manager_init_service_impl.h" | 9 #include "mojo/services/view_manager/view_manager_init_service_impl.h" |
| 10 | 10 |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 if (!shell_handle.is_valid()) | 27 if (!shell_handle.is_valid()) |
| 28 return; | 28 return; |
| 29 | 29 |
| 30 // TODO(sky): this needs some sort of authentication as well as making sure | 30 // TODO(sky): this needs some sort of authentication as well as making sure |
| 31 // we only ever have one active at a time. | 31 // we only ever have one active at a time. |
| 32 scoped_ptr<ApplicationImpl> app( | 32 scoped_ptr<ApplicationImpl> app( |
| 33 new ApplicationImpl(this, shell_handle.Pass())); | 33 new ApplicationImpl(this, shell_handle.Pass())); |
| 34 apps_.push_back(app.release()); | 34 apps_.push_back(app.release()); |
| 35 } | 35 } |
| 36 | 36 |
| 37 void ViewManagerLoader::OnServiceError(ApplicationManager* manager, | 37 void ViewManagerLoader::OnApplicationError(ApplicationManager* manager, |
| 38 const GURL& url) { | 38 const GURL& url) { |
| 39 } | 39 } |
| 40 | 40 |
| 41 bool ViewManagerLoader::ConfigureIncomingConnection( | 41 bool ViewManagerLoader::ConfigureIncomingConnection( |
| 42 ApplicationConnection* connection) { | 42 ApplicationConnection* connection) { |
| 43 context_.ConfigureIncomingConnection(connection); | 43 context_.ConfigureIncomingConnection(connection); |
| 44 connection->AddService(this); | 44 connection->AddService(this); |
| 45 return true; | 45 return true; |
| 46 } | 46 } |
| 47 | 47 |
| 48 void ViewManagerLoader::Create( | 48 void ViewManagerLoader::Create( |
| 49 ApplicationConnection* connection, | 49 ApplicationConnection* connection, |
| 50 InterfaceRequest<ViewManagerInitService> request) { | 50 InterfaceRequest<ViewManagerInitService> request) { |
| 51 BindToRequest(new ViewManagerInitServiceImpl(connection, &context_), | 51 BindToRequest(new ViewManagerInitServiceImpl(connection, &context_), |
| 52 &request); | 52 &request); |
| 53 } | 53 } |
| 54 | 54 |
| 55 } // namespace shell | 55 } // namespace shell |
| 56 } // namespace mojo | 56 } // namespace mojo |
| OLD | NEW |