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

ash/mus/shelf_delegate_mus.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 "ash/mus/shelf_delegate_mus.h"
 
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_item_delegate.h"
 #include "ash/shelf/shelf_item_delegate_manager.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_model.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "base/strings/string_util.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 "mojo/common/common_type_converters.h"
 #include "mojo/shell/public/cpp/connector.h"
 #include "ui/aura/mus/mus_util.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/image/image_skia.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/views/mus/window_manager_connection.h"
 
 using mash::wm::mojom::UserWindowController;
 
 namespace ash {
 namespace sysui {
 
 namespace {
 
@@ skipping 42 matching lines @@
   void Close() override { NOTIMPLEMENTED(); }
 
   // TODO(msw): Support multiple open windows per button.
   uint32_t window_id_;
   base::string16 title_;
   UserWindowController* user_window_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfItemDelegateMus);
 };
 
+// Returns an icon image from a serialized SkBitmap, or the default shelf icon
+// image if the bitmap is empty. Assumes the bitmap is a 1x icon.
+// TODO(jamescook): Support other scale factors.
+gfx::ImageSkia GetShelfIconFromBitmap(
+    const mojo::Array<uint8_t>& serialized_bitmap) {
+  // Convert the data to an ImageSkia.
+  SkBitmap bitmap = mojo::ConvertTo<SkBitmap, const std::vector<uint8_t>>(
+      serialized_bitmap.storage());
+  gfx::ImageSkia icon_image;
+  if (!bitmap.isNull()) {
+    icon_image = gfx::ImageSkia::CreateFrom1xBitmap(bitmap);
+  } else {
+    // Use default icon.
+    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+    icon_image = *rb.GetImageSkiaNamed(IDR_DEFAULT_FAVICON);
+  }
+  return icon_image;
+}
+
 }  // namespace
 
 ShelfDelegateMus::ShelfDelegateMus(ShelfModel* model)
     : model_(model), binding_(this) {
   mojo::Connector* connector =
       views::WindowManagerConnection::Get()->connector();
   connector->ConnectToInterface("mojo:desktop_wm", &user_window_controller_);
   user_window_controller_->AddUserWindowObserver(
       binding_.CreateInterfacePtrAndBind());
 }
@@ skipping 52 matching lines @@
     mojo::Array<mash::wm::mojom::UserWindowPtr> user_windows) {
   for (size_t i = 0; i < user_windows.size(); ++i)
     OnUserWindowAdded(std::move(user_windows[i]));
 }
 
 void ShelfDelegateMus::OnUserWindowAdded(
     mash::wm::mojom::UserWindowPtr user_window) {
   ShelfItem item;
   item.type = TYPE_PLATFORM_APP;
   item.status = user_window->window_has_focus ? STATUS_ACTIVE : STATUS_RUNNING;
-  // TODO(msw): Support actual window icons.
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-  item.image = *rb.GetImageSkiaNamed(IDR_DEFAULT_FAVICON);
+  item.image = GetShelfIconFromBitmap(user_window->window_app_icon);
 
   ShelfID shelf_id = model_->next_id();
   window_id_to_shelf_id_.insert(
       std::make_pair(user_window->window_id, shelf_id));
   model_->Add(item);
 
   ShelfItemDelegateManager* manager =
       Shell::GetInstance()->shelf_item_delegate_manager();
   scoped_ptr<ShelfItemDelegate> delegate(new ShelfItemDelegateMus(
       user_window->window_id, user_window->window_title.To<base::string16>(),
@@ skipping 22 matching lines @@
   // There's nothing in the ShelfItem that needs to be updated. But we still
   // need to update the ShelfModel so that the observers can pick up any
   // changes.
   int index = model_->ItemIndexByID(shelf_id);
   DCHECK_GE(index, 0);
   ShelfItems::const_iterator iter = model_->ItemByID(shelf_id);
   DCHECK(iter != model_->items().end());
   model_->Set(index, *iter);
 }
 
+void ShelfDelegateMus::OnUserWindowAppIconChanged(
+    uint32_t window_id,
+    mojo::Array<uint8_t> app_icon) {
+  // Find the shelf ID for this window.
+  DCHECK(window_id_to_shelf_id_.count(window_id));
+  ShelfID shelf_id = window_id_to_shelf_id_[window_id];
+  DCHECK_GT(shelf_id, 0);
+
+  // Update the icon in the ShelfItem.
+  int index = model_->ItemIndexByID(shelf_id);
+  if (index == -1)

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

optional nit: DCHECK and use use ItemByID instead (plus copy ctor), like above.

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

Done.

+    return;
+  ShelfItem item = model_->items()[index];
+  item.image = GetShelfIconFromBitmap(app_icon);
+  model_->Set(index, item);
+}
+
 void ShelfDelegateMus::OnUserWindowFocusChanged(uint32_t window_id,
                                                 bool has_focus) {
   DCHECK(window_id_to_shelf_id_.count(window_id));
   ShelfID shelf_id = window_id_to_shelf_id_[window_id];
   int index = model_->ItemIndexByID(shelf_id);
   DCHECK_GE(index, 0);
   ShelfItems::const_iterator iter = model_->ItemByID(shelf_id);
   DCHECK(iter != model_->items().end());
   ShelfItem item = *iter;
   item.status = has_focus ? STATUS_ACTIVE : STATUS_RUNNING;
   model_->Set(index, item);
 }
 
 }  // namespace sysui
 }  // namespace ash