Index: mojo/shell/public/cpp/lib/shell_connection.cc |
diff --git a/mojo/shell/public/cpp/lib/shell_connection.cc b/mojo/shell/public/cpp/lib/shell_connection.cc |
index 1f26780f14d271dc524c58220755a4e388b4c474..52150056c216ebf574c3ac9e7cd0d9a7c6c349fd 100644 |
--- a/mojo/shell/public/cpp/lib/shell_connection.cc |
+++ b/mojo/shell/public/cpp/lib/shell_connection.cc |
@@ -80,11 +80,11 @@ scoped_ptr<Connection> ShellConnection::Connect(ConnectParams* params) { |
// filter here too? |
std::set<std::string> allowed; |
allowed.insert("*"); |
- InterfaceProviderPtr local_interfaces; |
- InterfaceRequest<InterfaceProvider> local_request = |
+ shell::mojom::InterfaceProviderPtr local_interfaces; |
+ shell::mojom::InterfaceProviderRequest local_request = |
GetProxy(&local_interfaces); |
- InterfaceProviderPtr remote_interfaces; |
- InterfaceRequest<InterfaceProvider> remote_request = |
+ shell::mojom::InterfaceProviderPtr remote_interfaces; |
+ shell::mojom::InterfaceProviderRequest remote_request = |
GetProxy(&remote_interfaces); |
scoped_ptr<internal::ConnectionImpl> registry(new internal::ConnectionImpl( |
application_url, application_url, |
@@ -124,8 +124,8 @@ void ShellConnection::Initialize(shell::mojom::ShellPtr shell, |
void ShellConnection::AcceptConnection( |
const String& requestor_url, |
uint32_t requestor_id, |
- InterfaceRequest<InterfaceProvider> local_interfaces, |
- InterfaceProviderPtr remote_interfaces, |
+ shell::mojom::InterfaceProviderRequest local_interfaces, |
+ shell::mojom::InterfaceProviderPtr remote_interfaces, |
Array<String> allowed_interfaces, |
const String& url) { |
scoped_ptr<Connection> registry(new internal::ConnectionImpl( |