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

ui/views/mus/native_widget_mus.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 "ui/views/mus/native_widget_mus.h"
 
 #include "base/macros.h"
 #include "base/thread_task_runner_handle.h"
 #include "components/mus/public/cpp/property_type_converters.h"
 #include "components/mus/public/cpp/window.h"
@@ skipping 178 matching lines @@
   int32_t behavior = mus::mojom::kResizeBehaviorNone;
   if (delegate->CanResize())
     behavior |= mus::mojom::kResizeBehaviorCanResize;
   if (delegate->CanMaximize())
     behavior |= mus::mojom::kResizeBehaviorCanMaximize;
   if (delegate->CanMinimize())
     behavior |= mus::mojom::kResizeBehaviorCanMinimize;
   return behavior;
 }
 
+// Returns the 1x window app icon or an empty SkBitmap if no icon is available.
+// TODO(jamescook): Support other scale factors.
+SkBitmap AppIconFromDelegate(WidgetDelegate* delegate) {
+  if (!delegate)
+    return SkBitmap();
+  gfx::ImageSkia app_icon = delegate->GetWindowAppIcon();
+  if (app_icon.isNull())
+    return SkBitmap();
+  return app_icon.GetRepresentation(1.f).sk_bitmap();
+}
+
 }  // namespace
 
 class NativeWidgetMus::MusWindowObserver : public mus::WindowObserver {
  public:
   explicit MusWindowObserver(NativeWidgetMus* native_widget_mus)
       : native_widget_mus_(native_widget_mus) {
     native_widget_mus_->window_->AddObserver(this);
   }
 
   ~MusWindowObserver() override {
@@ skipping 136 matching lines @@
   if (!Widget::RequiresNonClientView(init_params.type))
     return;
 
   (*properties)[mus::mojom::WindowManager::kWindowType_Property] =
       mojo::TypeConverter<const std::vector<uint8_t>, int32_t>::Convert(
           static_cast<int32_t>(
               mojo::ConvertTo<mus::mojom::WindowType>(init_params.type)));
   (*properties)[mus::mojom::WindowManager::kResizeBehavior_Property] =
       mojo::TypeConverter<const std::vector<uint8_t>, int32_t>::Convert(
           ResizeBehaviorFromDelegate(init_params.delegate));
+  SkBitmap app_icon = AppIconFromDelegate(init_params.delegate);
+  if (!app_icon.isNull()) {
+    (*properties)[mus::mojom::WindowManager::kWindowAppIcon_Property] =
+        mojo::TypeConverter<const std::vector<uint8_t>, SkBitmap>::Convert(
+            app_icon);
+  }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetMus, internal::NativeWidgetPrivate implementation:
 
 NonClientFrameView* NativeWidgetMus::CreateNonClientFrameView() {
   return new ClientSideNonClientFrameView(GetWidget());
 }
 
 void NativeWidgetMus::InitNativeWidget(const Widget::InitParams& params) {
@@ skipping 170 matching lines @@
           ? window_->GetSharedProperty<base::string16>(kWindowTitle_Property)
           : base::string16();
   if (current_title == title)
     return false;
   window_->SetSharedProperty<base::string16>(kWindowTitle_Property, title);
   return true;
 }
 
 void NativeWidgetMus::SetWindowIcons(const gfx::ImageSkia& window_icon,
                                      const gfx::ImageSkia& app_icon) {
-  // NOTIMPLEMENTED();
+  const char* const kWindowAppIcon_Property =
+      mus::mojom::WindowManager::kWindowAppIcon_Property;
+
+  if (!app_icon.isNull()) {
+    // Send the app icon 1x bitmap to the window manager.
+    // TODO(jamescook): Support other scale factors.
+    window_->SetSharedProperty<SkBitmap>(
+        kWindowAppIcon_Property, app_icon.GetRepresentation(1.f).sk_bitmap());
+  } else if (window_->HasSharedProperty(kWindowAppIcon_Property)) {
+    // Remove the existing icon.
+    window_->ClearSharedProperty(kWindowAppIcon_Property);
+  }
 }
 
 void NativeWidgetMus::InitModalType(ui::ModalType modal_type) {
   if (modal_type != ui::MODAL_TYPE_NONE)
     window_->SetModal();
 }
 
 gfx::Rect NativeWidgetMus::GetWindowBoundsInScreen() const {
   return window_ ? window_->GetBoundsInRoot() : gfx::Rect();
 }
@@ skipping 421 matching lines @@
     window_tree_host_->Show();
     GetNativeWindow()->Show();
   } else {
     window_tree_host_->Hide();
     GetNativeWindow()->Hide();
   }
   native_widget_delegate_->OnNativeWidgetVisibilityChanged(window->visible());
 }
 
 }  // namespace views