| 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 |
| 11 namespace mojo { | 11 namespace mojo { |
| 12 | 12 |
| 13 using view_manager::ViewManagerInitService; | 13 using service::ViewManagerInitServiceImpl; |
| 14 using view_manager::service::ViewManagerInitServiceImpl; | |
| 15 | 14 |
| 16 namespace shell { | 15 namespace shell { |
| 17 | 16 |
| 18 ViewManagerLoader::ViewManagerLoader() { | 17 ViewManagerLoader::ViewManagerLoader() { |
| 19 } | 18 } |
| 20 | 19 |
| 21 ViewManagerLoader::~ViewManagerLoader() { | 20 ViewManagerLoader::~ViewManagerLoader() { |
| 22 } | 21 } |
| 23 | 22 |
| 24 void ViewManagerLoader::LoadService( | 23 void ViewManagerLoader::LoadService( |
| (...skipping 20 matching lines...) Expand all Loading... |
| 45 | 44 |
| 46 void ViewManagerLoader::Create( | 45 void ViewManagerLoader::Create( |
| 47 ApplicationConnection* connection, | 46 ApplicationConnection* connection, |
| 48 InterfaceRequest<ViewManagerInitService> request) { | 47 InterfaceRequest<ViewManagerInitService> request) { |
| 49 BindToRequest(new ViewManagerInitServiceImpl(connection, &context_), | 48 BindToRequest(new ViewManagerInitServiceImpl(connection, &context_), |
| 50 &request); | 49 &request); |
| 51 } | 50 } |
| 52 | 51 |
| 53 } // namespace shell | 52 } // namespace shell |
| 54 } // namespace mojo | 53 } // namespace mojo |
| OLD | NEW |