Add mash shelf application id support.

services/shell/public/cpp/shell_connection.h

 // 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.
 
 #ifndef SERVICES_SHELL_PUBLIC_CPP_SHELL_CONNECTION_H_
 #define SERVICES_SHELL_PUBLIC_CPP_SHELL_CONNECTION_H_
 
 #include <memory>
 #include <utility>
 #include <vector>
@@ skipping 36 matching lines @@
   // Creates a new ShellConnection bound to |request|. This connection may be
   // used immediately to make outgoing connections via connector().  Does not
   // take ownership of |client|, which must remain valid for the lifetime of
   // ShellConnection.
   ShellConnection(shell::ShellClient* client,
                   mojom::ShellClientRequest request);
 
   ~ShellConnection() override;
 
   Connector* connector() { return connector_.get(); }
+  const Identity& identity() { return identity_; }
 
   // TODO(rockot): Remove this. http://crbug.com/594852.
   void set_initialize_handler(const base::Closure& callback);
 
   // TODO(rockot): Remove this once we get rid of app tests.
   void SetAppTestConnectorForTesting(mojom::ConnectorPtr connector);
 
   // Specify a function to be called when the connection to the shell is lost.
   void set_connection_lost_closure(const base::Closure& closure) {
     connection_lost_closure_ = closure;
   }
 
 private:

[sky, 2016/04/22 15:51:19]

nit: fix this line too.

[msw, 2016/04/22 19:02:18]

Done.

- // mojom::ShellClient:
- void Initialize(mojom::IdentityPtr identity,
-                 uint32_t id,
-                 const InitializeCallback& callback) override;
- void AcceptConnection(mojom::IdentityPtr source,
-                       uint32_t source_id,
-                       mojom::InterfaceProviderRequest remote_interfaces,
-                       mojom::InterfaceProviderPtr local_interfaces,
-                       mojom::CapabilityRequestPtr allowed_capabilities,
-                       const mojo::String& name) override;
+  // mojom::ShellClient:
+  void Initialize(mojom::IdentityPtr identity,
+                  uint32_t id,
+                  const InitializeCallback& callback) override;
+  void AcceptConnection(mojom::IdentityPtr source,
+                        uint32_t source_id,
+                        mojom::InterfaceProviderRequest remote_interfaces,
+                        mojom::InterfaceProviderPtr local_interfaces,
+                        mojom::CapabilityRequestPtr allowed_capabilities,
+                        const mojo::String& name) override;
 
- void OnConnectionError();
+  void OnConnectionError();
 
- // A callback called when Initialize() is run.
- base::Closure initialize_handler_;
+  // A callback called when Initialize() is run.
+  base::Closure initialize_handler_;
 
- // We track the lifetime of incoming connection registries as it more
- // convenient for the client.
- ScopedVector<Connection> incoming_connections_;
+  // We track the lifetime of incoming connection registries as it more
+  // convenient for the client.
+  ScopedVector<Connection> incoming_connections_;
 
- // A pending Connector request which will eventually be passed to the shell.
- mojom::ConnectorRequest pending_connector_request_;
+  // A pending Connector request which will eventually be passed to the shell.
+  mojom::ConnectorRequest pending_connector_request_;
 
- shell::ShellClient* client_;
- mojo::Binding<mojom::ShellClient> binding_;
- std::unique_ptr<Connector> connector_;
+  shell::ShellClient* client_;
+  mojo::Binding<mojom::ShellClient> binding_;
+  std::unique_ptr<Connector> connector_;
+  shell::Identity identity_;
 
- base::Closure connection_lost_closure_;
+  base::Closure connection_lost_closure_;
 
- DISALLOW_COPY_AND_ASSIGN(ShellConnection);
+  DISALLOW_COPY_AND_ASSIGN(ShellConnection);
 };
 
 }  // namespace shell
 
 #endif  // SERVICES_SHELL_PUBLIC_CPP_SHELL_CONNECTION_H_