| 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 "shell/android/android_handler_loader.h" | 5 #include "shell/android/android_handler_loader.h" |
| 6 | 6 |
| 7 namespace mojo { | |
| 8 namespace shell { | 7 namespace shell { |
| 9 | 8 |
| 10 AndroidHandlerLoader::AndroidHandlerLoader() { | 9 AndroidHandlerLoader::AndroidHandlerLoader() { |
| 11 } | 10 } |
| 12 | 11 |
| 13 AndroidHandlerLoader::~AndroidHandlerLoader() { | 12 AndroidHandlerLoader::~AndroidHandlerLoader() { |
| 14 } | 13 } |
| 15 | 14 |
| 16 void AndroidHandlerLoader::Load( | 15 void AndroidHandlerLoader::Load( |
| 17 const GURL& url, | 16 const GURL& url, |
| 18 InterfaceRequest<Application> application_request) { | 17 mojo::InterfaceRequest<mojo::Application> application_request) { |
| 19 DCHECK(application_request.is_pending()); | 18 DCHECK(application_request.is_pending()); |
| 20 application_.reset( | 19 application_.reset( |
| 21 new ApplicationImpl(&android_handler_, application_request.Pass())); | 20 new mojo::ApplicationImpl(&android_handler_, application_request.Pass())); |
| 22 } | 21 } |
| 23 | 22 |
| 24 } // namespace shell | 23 } // namespace shell |
| 25 } // namespace mojo | |
| OLD | NEW |