Add a user id parameter to connections

mojo/shell/public/cpp/lib/shell_connection.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <algorithm>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 68 matching lines @@
 
 #ifndef NDEBUG
   scoped_refptr<base::SingleThreadTaskRunner> clone_task_runner_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(AppRefCountImpl);
 };
 
 
 ShellConnection::ConnectParams::ConnectParams(const std::string& url)
-    : url_(url), filter_(shell::mojom::CapabilityFilter::New()) {
+    : url_(url),
+      filter_(shell::mojom::CapabilityFilter::New()),
+      user_id_(shell::mojom::Shell::kUserInherit) {
   filter_->filter.SetToEmpty();
 }
 ShellConnection::ConnectParams::~ConnectParams() {}
 
 ////////////////////////////////////////////////////////////////////////////////
 // ShellConnection, public:
 
 ShellConnection::ShellConnection(
     mojo::ShellClient* client,
     InterfaceRequest<shell::mojom::ShellClient> request)
@@ skipping 40 matching lines @@
   std::set<std::string> allowed;
   allowed.insert("*");
   shell::mojom::InterfaceProviderPtr local_interfaces;
   shell::mojom::InterfaceProviderRequest local_request =
       GetProxy(&local_interfaces);
   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,
-      shell::mojom::Shell::kInvalidApplicationID, std::move(remote_interfaces),
-      std::move(local_request), allowed));
+      shell::mojom::Shell::kInvalidApplicationID, params->user_id(),
+      std::move(remote_interfaces), std::move(local_request), allowed));
   shell_->Connect(application_url,
+                  params->user_id(),
                   std::move(remote_request),
                   std::move(local_interfaces),
                   params->TakeFilter(),
                   registry->GetConnectCallback());
   return std::move(registry);
 }
 
 void ShellConnection::Quit() {
   // We can't quit immediately, since there could be in-flight requests from the
   // shell. So check with it first.
   if (shell_) {
     quit_requested_ = true;
     shell_->QuitApplication();
   } else {
     QuitNow();
   }
 }
 
 scoped_ptr<AppRefCount> ShellConnection::CreateAppRefCount() {
   AddRef();
   return make_scoped_ptr(
       new AppRefCountImpl(this, base::MessageLoop::current()->task_runner()));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ShellConnection, shell::mojom::ShellClient implementation:
 
 void ShellConnection::Initialize(shell::mojom::ShellPtr shell,
                                  const mojo::String& url,
-                                 uint32_t id) {
+                                 uint32_t id,
+                                 uint32_t user_id) {
   shell_ = std::move(shell);
   shell_.set_connection_error_handler([this]() { OnConnectionError(); });
-  client_->Initialize(this, url, id);
+  client_->Initialize(this, url, id, user_id);
 }
 
 void ShellConnection::AcceptConnection(
     const String& requestor_url,
     uint32_t requestor_id,
+    uint32_t requestor_user_id,
     shell::mojom::InterfaceProviderRequest local_interfaces,
     shell::mojom::InterfaceProviderPtr remote_interfaces,
     Array<String> allowed_interfaces,
     const String& url) {
   scoped_ptr<Connection> registry(new internal::ConnectionImpl(
-      url, requestor_url, requestor_id, std::move(remote_interfaces),
-      std::move(local_interfaces),
+      url, requestor_url, requestor_id, requestor_user_id,
+      std::move(remote_interfaces), std::move(local_interfaces),
       allowed_interfaces.To<std::set<std::string>>()));
   if (!client_->AcceptConnection(registry.get()))
     return;
 
   // If we were quitting because we thought there were no more interfaces for
   // this app in use, then that has changed so cancel the quit request.
   if (quit_requested_)
     quit_requested_ = false;
 
   incoming_connections_.push_back(std::move(registry));
@@ skipping 50 matching lines @@
 shell::mojom::CapabilityFilterPtr CreatePermissiveCapabilityFilter() {
   shell::mojom::CapabilityFilterPtr filter(
       shell::mojom::CapabilityFilter::New());
   Array<String> all_interfaces;
   all_interfaces.push_back("*");
   filter->filter.insert("*", std::move(all_interfaces));
   return filter;
 }
 
 }  // namespace mojo