Mash: Show app icons in shelf based on the Widget's app icon

mash/wm/window_manager.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/window_manager.h"
 
 #include <stdint.h>
 #include <utility>
 
 #include "components/mus/common/types.h"
@@ skipping 135 matching lines @@
 
 bool WindowManager::OnWmSetProperty(
     mus::Window* window,
     const std::string& name,
     scoped_ptr<std::vector<uint8_t>>* new_data) {
   // TODO(sky): constrain this to set of keys we know about, and allowed
   // values.
   return name == mus::mojom::WindowManager::kShowState_Property ||
          name == mus::mojom::WindowManager::kPreferredSize_Property ||
          name == mus::mojom::WindowManager::kResizeBehavior_Property ||
-         name == mus::mojom::WindowManager::kWindowTitle_Property;
+         name == mus::mojom::WindowManager::kWindowTitle_Property ||
+         name == mus::mojom::WindowManager::kWindowAppIcon_Property;

[msw, 2016/03/24 17:40:54]

nit: also abc order

[James Cook, 2016/03/25 15:39:28]

Done.

 }
 
 mus::Window* WindowManager::OnWmCreateTopLevelWindow(
     std::map<std::string, std::vector<uint8_t>>* properties) {
   return NewTopLevelWindow(properties);
 }
 
 void WindowManager::OnAccelerator(uint32_t id, const ui::Event& event) {
   root_controller_->OnAccelerator(id, std::move(event));
 }
 
 void WindowManager::ScreenlockStateChanged(bool locked) {
   // Hide USER_PRIVATE windows when the screen is locked.
   mus::Window* window = root_controller_->GetWindowForContainer(
       mash::wm::mojom::Container::USER_PRIVATE);
   window->SetVisible(!locked);
 }
 
 }  // namespace wm
 }  // namespace mash