| OLD | NEW | 
|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/shell_application_loader.h" | 5 #include "mojo/shell/shell_application_loader.h" | 
| 6 | 6 | 
|  | 7 #include <utility> | 
|  | 8 | 
| 7 #include "mojo/application/public/cpp/application_impl.h" | 9 #include "mojo/application/public/cpp/application_impl.h" | 
| 8 #include "mojo/shell/shell_application_delegate.h" | 10 #include "mojo/shell/shell_application_delegate.h" | 
| 9 | 11 | 
| 10 namespace mojo { | 12 namespace mojo { | 
| 11 namespace shell { | 13 namespace shell { | 
| 12 | 14 | 
| 13 ShellApplicationLoader::ShellApplicationLoader(ApplicationManager* manager) | 15 ShellApplicationLoader::ShellApplicationLoader(ApplicationManager* manager) | 
| 14     : manager_(manager) {} | 16     : manager_(manager) {} | 
| 15 ShellApplicationLoader::~ShellApplicationLoader() {} | 17 ShellApplicationLoader::~ShellApplicationLoader() {} | 
| 16 | 18 | 
| 17 void ShellApplicationLoader::Load( | 19 void ShellApplicationLoader::Load( | 
| 18     const GURL& url, | 20     const GURL& url, | 
| 19     InterfaceRequest<Application> application_request) { | 21     InterfaceRequest<Application> application_request) { | 
| 20   DCHECK(application_request.is_pending()); | 22   DCHECK(application_request.is_pending()); | 
| 21   app_.reset(new ApplicationImpl(new ShellApplicationDelegate(manager_), | 23   app_.reset(new ApplicationImpl(new ShellApplicationDelegate(manager_), | 
| 22                                  application_request.Pass())); | 24                                  std::move(application_request))); | 
| 23 } | 25 } | 
| 24 | 26 | 
| 25 }  // namespace shell | 27 }  // namespace shell | 
| 26 }  // namespace mojo | 28 }  // namespace mojo | 
| OLD | NEW | 
|---|