Add mash shelf application id support.

mash/wm/user_window_controller_impl.cc

 // Copyright 2015 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/wm/user_window_controller_impl.h"
 
 #include "components/mus/public/cpp/property_type_converters.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_property.h"
 #include "components/mus/public/cpp/window_tree_connection.h"
@@ skipping 20 matching lines @@
   return window;
 }
 
 // Get a UserWindow struct from a mus::Window.
 mojom::UserWindowPtr GetUserWindow(mus::Window* window) {
   mojom::UserWindowPtr user_window(mojom::UserWindow::New());
   DCHECK_NE(0u, window->GetLocalProperty(kUserWindowIdKey));
   user_window->window_id = window->GetLocalProperty(kUserWindowIdKey);
   user_window->window_title = mojo::String::From(GetWindowTitle(window));
   user_window->window_app_icon = GetWindowAppIcon(window);
+  user_window->window_app_id = mojo::String::From(GetAppID(window));
   mus::Window* focused = window->connection()->GetFocusedWindow();
   focused = GetTopLevelWindow(focused, window->parent());
   user_window->window_has_focus = focused == window;
   return user_window;
 }
 
 }  // namespace
 
 // Observes property changes on user windows. UserWindowControllerImpl uses
 // this separate observer to avoid observing duplicate tree change
@@ skipping 130 matching lines @@
 }
 
 void UserWindowControllerImpl::FocusUserWindow(uint32_t window_id) {
   mus::Window* window = GetUserWindowById(window_id);
   if (window)
     window->SetFocus();
 }
 
 }  // namespace wm
 }  // namespace mash