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_delegate.h" | 5 #include "mojo/shell/shell_application_delegate.h" |
6 | 6 |
7 #include "mojo/application/public/cpp/application_connection.h" | 7 #include "mojo/application/public/cpp/application_connection.h" |
8 #include "mojo/shell/application_manager.h" | 8 #include "mojo/shell/application_manager.h" |
9 | 9 |
10 namespace mojo { | 10 namespace mojo { |
(...skipping 10 matching lines...) Expand all Loading... |
21 connection->AddService<mojom::ApplicationManager>(this); | 21 connection->AddService<mojom::ApplicationManager>(this); |
22 return true; | 22 return true; |
23 } | 23 } |
24 | 24 |
25 void ShellApplicationDelegate::Create( | 25 void ShellApplicationDelegate::Create( |
26 ApplicationConnection* connection, | 26 ApplicationConnection* connection, |
27 InterfaceRequest<mojom::ApplicationManager> request) { | 27 InterfaceRequest<mojom::ApplicationManager> request) { |
28 bindings_.AddBinding(this, request.Pass()); | 28 bindings_.AddBinding(this, request.Pass()); |
29 } | 29 } |
30 | 30 |
31 void ShellApplicationDelegate::CreateInstanceForHandle(ScopedHandle channel, | 31 void ShellApplicationDelegate::CreateInstanceForHandle( |
32 const String& url) { | 32 ScopedHandle channel, |
33 manager_->CreateInstanceForHandle(channel.Pass(), GURL(url)); | 33 const String& url, |
| 34 CapabilityFilterPtr filter) { |
| 35 manager_->CreateInstanceForHandle(channel.Pass(), GURL(url), filter.Pass()); |
34 } | 36 } |
35 | 37 |
36 } // namespace shell | 38 } // namespace shell |
37 } // namespace mojo | 39 } // namespace mojo |
OLD | NEW |