Add gfx::ImageSkia and icon support to aura::PropertyConverter.

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.
 
 // This has to be before any other includes, else default is picked up.
 // See base/logging for details on this.
 #define NOTIMPLEMENTED_POLICY 5
 
 #include "ui/views/mus/native_widget_mus.h"
 
@@ skipping 319 matching lines @@
   int32_t behavior = ui::mojom::kResizeBehaviorNone;
   if (delegate->CanResize())
     behavior |= ui::mojom::kResizeBehaviorCanResize;
   if (delegate->CanMaximize())
     behavior |= ui::mojom::kResizeBehaviorCanMaximize;
   if (delegate->CanMinimize())
     behavior |= ui::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();
-}
-
 // Handles acknowledgment of an input event, either immediately when a nested
 // message loop starts, or upon destruction.
 class EventAckHandler : public base::MessageLoop::NestingObserver {
  public:
   explicit EventAckHandler(
       std::unique_ptr<base::Callback<void(EventResult)>> ack_callback)
       : ack_callback_(std::move(ack_callback)) {
     DCHECK(ack_callback_);
     base::MessageLoop::current()->AddNestingObserver(this);
   }
@@ skipping 36 matching lines @@
   if (!window ||
       !window->HasSharedProperty(
           ui::mojom::WindowManager::kShowState_Property)) {
     return ui::mojom::ShowState::DEFAULT;
   }
 
   return static_cast<ui::mojom::ShowState>(window->GetSharedProperty<int32_t>(
       ui::mojom::WindowManager::kShowState_Property));
 }
 
+// Set the app or window icon property for the window.
+void SetIconProperty(ui::Window* window,
+                     const char* const property,
+                     const gfx::ImageSkia& icon) {
+  // TODO(crbug.com/667566): Support additional scales or gfx::Image[Skia].
+  SkBitmap bitmap = icon.GetRepresentation(1.f).sk_bitmap();
+  if (!bitmap.isNull())
+    window->SetSharedProperty<SkBitmap>(property, bitmap);
+  else if (window->HasSharedProperty(property))
+    window->ClearSharedProperty(property);
+}
+
 }  // namespace
 
 class NativeWidgetMus::MusWindowObserver : public ui::WindowObserver {
  public:
   explicit MusWindowObserver(NativeWidgetMus* native_widget_mus)
       : native_widget_mus_(native_widget_mus),
         show_state_(ui::mojom::ShowState::DEFAULT) {
     mus_window()->AddObserver(this);
   }
 
@@ skipping 268 matching lines @@
   (*properties)[ui::mojom::WindowManager::kWindowType_Property] =
       mojo::ConvertTo<std::vector<uint8_t>>(static_cast<int32_t>(
           mojo::ConvertTo<ui::mojom::WindowType>(init_params.type)));
   if (init_params.delegate &&
       properties->count(ui::mojom::WindowManager::kResizeBehavior_Property) ==
           0) {
     (*properties)[ui::mojom::WindowManager::kResizeBehavior_Property] =
         mojo::ConvertTo<std::vector<uint8_t>>(
             ResizeBehaviorFromDelegate(init_params.delegate));
   }
-  SkBitmap app_icon = AppIconFromDelegate(init_params.delegate);
-  if (!app_icon.isNull()) {
-    (*properties)[ui::mojom::WindowManager::kWindowAppIcon_Property] =
-        mojo::ConvertTo<std::vector<uint8_t>>(app_icon);
+
+  if (init_params.delegate) {
+    // TODO(crbug.com/667566): Support additional scales or gfx::Image[Skia].
+    gfx::ImageSkia app_icon = init_params.delegate->GetWindowAppIcon();
+    SkBitmap app_bitmap = app_icon.GetRepresentation(1.f).sk_bitmap();
+    if (!app_bitmap.isNull()) {
+      (*properties)[ui::mojom::WindowManager::kAppIcon_Property] =
+          mojo::ConvertTo<std::vector<uint8_t>>(app_bitmap);
+    }
+    // TODO(crbug.com/667566): Support additional scales or gfx::Image[Skia].
+    gfx::ImageSkia window_icon = init_params.delegate->GetWindowIcon();
+    SkBitmap window_bitmap = window_icon.GetRepresentation(1.f).sk_bitmap();
+    if (!window_bitmap.isNull()) {
+      (*properties)[ui::mojom::WindowManager::kWindowIcon_Property] =
+          mojo::ConvertTo<std::vector<uint8_t>>(window_bitmap);
+    }
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetMus, internal::NativeWidgetPrivate implementation:
 
 NonClientFrameView* NativeWidgetMus::CreateNonClientFrameView() {
   return new ClientSideNonClientFrameView(GetWidget());
 }
 
@@ skipping 223 matching lines @@
     return false;
   window_->SetSharedProperty<base::string16>(kWindowTitle_Property, title);
   return true;
 }
 
 void NativeWidgetMus::SetWindowIcons(const gfx::ImageSkia& window_icon,
                                      const gfx::ImageSkia& app_icon) {
   if (is_parallel_widget_in_window_manager())
     return;
 
-  const char* const kWindowAppIcon_Property =
-      ui::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);
-  }
+  SetIconProperty(window_, ui::mojom::WindowManager::kWindowIcon_Property,
+                  window_icon);
+  SetIconProperty(window_, ui::mojom::WindowManager::kAppIcon_Property,
+                  app_icon);
 }
 
 void NativeWidgetMus::InitModalType(ui::ModalType modal_type) {
   if (modal_type != ui::MODAL_TYPE_NONE)
     window_->SetModal();
 }
 
 gfx::Rect NativeWidgetMus::GetWindowBoundsInScreen() const {
   if (!window_)
     return gfx::Rect();
@@ skipping 606 matching lines @@
 
   gfx::Path mask_path;
   native_widget_delegate_->GetHitTestMask(&mask_path);
   // TODO(jamescook): Use the full path for the mask.
   gfx::Rect mask_rect =
       gfx::ToEnclosingRect(gfx::SkRectToRectF(mask_path.getBounds()));
   window_->SetHitTestMask(mask_rect);
 }
 
 }  // namespace views