Add mash shelf application id support.

mash/login/login.cc

 // Copyright 2016 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 "mash/login/login.h"
 
 #include <map>
 #include <memory>
 
 #include "base/guid.h"
@@ skipping 18 matching lines @@
 
 namespace mash {
 namespace login {
 namespace {
 
 class Login;
 
 class UI : public views::WidgetDelegateView,
            public views::ButtonListener {
  public:
-  static void Show(shell::Connector* connector, Login* login) {
+  static void Show(shell::Connector* connector,
+                   const shell::Identity& identity,
+                   Login* login) {
     UI* ui = new UI(login, connector);
     ui->StartWindowManager();
 
-    views::WindowManagerConnection::Create(connector);
+    views::WindowManagerConnection::Create(connector, identity);
 
     views::Widget* widget = new views::Widget;
     views::Widget::InitParams params(
         views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
     params.delegate = ui;
 
     std::map<std::string, std::vector<uint8_t>> properties;
     properties[mash::wm::mojom::kWindowContainer_Property] =
         mojo::ConvertTo<std::vector<uint8_t>>(
             static_cast<int32_t>(mash::wm::mojom::Container::LOGIN_WINDOWS));
@@ skipping 88 matching lines @@
     connector_->ConnectToInterface("mojo:mash_init", &init);
     init->StartService("mojo:mash_session", user_id);
   }
 
  private:
   // shell::ShellClient:
   void Initialize(shell::Connector* connector,
                   const shell::Identity& identity,
                   uint32_t id) override {
     connector_ = connector;
+    identity_ = identity;
     tracing_.Initialize(connector, identity.name());
 
     aura_init_.reset(new views::AuraInit(connector, "views_mus_resources.pak"));
 
     connector_->ConnectToInterface("mojo:mus", &user_access_manager_);
     user_access_manager_->SetActiveUser(identity.user_id());
   }
   bool AcceptConnection(shell::Connection* connection) override {
     connection->AddInterface<mojom::Login>(this);
     return true;
   }
 
   // shell::InterfaceFactory<mojom::Login>:
   void Create(shell::Connection* connection,
               mojom::LoginRequest request) override {
     bindings_.AddBinding(this, std::move(request));
   }
 
   // mojom::Login:
   void ShowLoginUI() override {
-    UI::Show(connector_, this);
+    UI::Show(connector_, identity_, this);
   }
   void SwitchUser() override {
-    UI::Show(connector_, this);
+    UI::Show(connector_, identity_, this);
   }
 
   void StartWindowManager();
 
   shell::Connector* connector_;
+  shell::Identity identity_;
   mojo::TracingImpl tracing_;
   std::unique_ptr<views::AuraInit> aura_init_;
   mojo::BindingSet<mojom::Login> bindings_;
   mus::mojom::UserAccessManagerPtr user_access_manager_;
   std::unique_ptr<shell::Connection> window_manager_connection_;
 
   DISALLOW_COPY_AND_ASSIGN(Login);
 };
 
 void UI::ButtonPressed(views::Button* sender, const ui::Event& event) {
   // Login...
   if (sender == login_button_1_) {
     login_->LoginAs(user_id_1_);
   } else if (sender == login_button_2_) {
     login_->LoginAs(user_id_2_);
   } else {
     NOTREACHED();
   }
   GetWidget()->Close();
 }
 
 }  // namespace
 
 shell::ShellClient* CreateLogin() {
   return new Login;
 }
 
 }  // namespace login
 }  // namespace main