| 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 "content/browser/mojo/mojo_app_connection_impl.h" | 5 #include "content/browser/mojo/mojo_app_connection_impl.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| 11 #include "content/browser/mojo/mojo_shell_context.h" | 11 #include "content/browser/mojo/mojo_shell_context.h" |
| 12 | 12 |
| 13 namespace content { | 13 namespace content { |
| 14 | 14 |
| 15 const char kBrowserMojoAppUrl[] = "system:content_browser"; | 15 const char kBrowserMojoAppUrl[] = "system:content_browser"; |
| 16 | 16 |
| 17 namespace { | 17 namespace { |
| 18 void OnGotInstanceID(uint32_t remote_id, uint32_t user_id) {} | 18 void OnGotInstanceID(const std::string& user_id, uint32_t remote_id) {} |
| 19 } // namespace | 19 } // namespace |
| 20 | 20 |
| 21 // static | 21 // static |
| 22 scoped_ptr<MojoAppConnection> MojoAppConnection::Create( | 22 scoped_ptr<MojoAppConnection> MojoAppConnection::Create( |
| 23 const std::string& name, | 23 const std::string& name, |
| 24 const std::string& requestor_name) { | 24 const std::string& requestor_name) { |
| 25 return scoped_ptr<MojoAppConnection>( | 25 return scoped_ptr<MojoAppConnection>( |
| 26 new MojoAppConnectionImpl(name, requestor_name)); | 26 new MojoAppConnectionImpl(name, requestor_name)); |
| 27 } | 27 } |
| 28 | 28 |
| 29 MojoAppConnectionImpl::MojoAppConnectionImpl( | 29 MojoAppConnectionImpl::MojoAppConnectionImpl( |
| 30 const std::string& name, | 30 const std::string& name, |
| 31 const std::string& requestor_name) { | 31 const std::string& requestor_name) { |
| 32 MojoShellContext::ConnectToApplication( | 32 MojoShellContext::ConnectToApplication( |
| 33 name, requestor_name, mojo::GetProxy(&interfaces_), | 33 name, requestor_name, mojo::GetProxy(&interfaces_), |
| 34 mojo::shell::mojom::InterfaceProviderPtr(), | 34 mojo::shell::mojom::InterfaceProviderPtr(), |
| 35 base::Bind(&OnGotInstanceID)); | 35 base::Bind(&OnGotInstanceID)); |
| 36 } | 36 } |
| 37 | 37 |
| 38 MojoAppConnectionImpl::~MojoAppConnectionImpl() { | 38 MojoAppConnectionImpl::~MojoAppConnectionImpl() { |
| 39 } | 39 } |
| 40 | 40 |
| 41 void MojoAppConnectionImpl::GetInterface( | 41 void MojoAppConnectionImpl::GetInterface( |
| 42 const std::string& interface_name, | 42 const std::string& interface_name, |
| 43 mojo::ScopedMessagePipeHandle handle) { | 43 mojo::ScopedMessagePipeHandle handle) { |
| 44 interfaces_->GetInterface(interface_name, std::move(handle)); | 44 interfaces_->GetInterface(interface_name, std::move(handle)); |
| 45 } | 45 } |
| 46 | 46 |
| 47 } // namespace content | 47 } // namespace content |
| OLD | NEW |