mash: Fix icon window property mirroring.

chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h"
 
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/wm/window_properties.h"
 #include "base/memory/ptr_util.h"
@@ skipping 15 matching lines @@
 #include "chrome/browser/ui/views/select_file_dialog_extension.h"
 #include "chrome/browser/ui/views/select_file_dialog_extension_factory.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/mus/property_converter.h"
 #include "ui/base/class_property.h"
 #include "ui/keyboard/content/keyboard.h"
 #include "ui/keyboard/keyboard_controller.h"
 #include "ui/views/mus/mus_client.h"
 #include "ui/views/mus/mus_property_mirror.h"
 
+namespace {
+
+void MirrorIcon(aura::Window* window,
+                aura::Window* root_window,
+                const aura::WindowProperty<gfx::ImageSkia*>* key) {
+  gfx::ImageSkia* value = window->GetProperty(key);
+  if (!value || value->isNull())
+    root_window->ClearProperty(key);
+  else
+    root_window->SetProperty(key, new gfx::ImageSkia(*value));
+}
+
+}  // namespace
+
 // Relays aura content window properties to its root window (the mash frame).
 // Ash relies on various window properties for frame titles, shelf items, etc.
 // These properties are read from the client's root, not child content windows.
 class MusPropertyMirrorAsh : public views::MusPropertyMirror {
  public:
   MusPropertyMirrorAsh() {}
   ~MusPropertyMirrorAsh() override {}
 
   // MusPropertyMirror:
   void MirrorPropertyFromWidgetWindowToRootWindow(aura::Window* window,
                                                   aura::Window* root_window,
                                                   const void* key) override {
     if (key == ash::kShelfIDKey) {
       int32_t value = window->GetProperty(ash::kShelfIDKey);
       root_window->SetProperty(ash::kShelfIDKey, value);
     } else if (key == ash::kShelfItemTypeKey) {
       int32_t value = window->GetProperty(ash::kShelfItemTypeKey);
       root_window->SetProperty(ash::kShelfItemTypeKey, value);
     } else if (key == aura::client::kAppIconKey) {
-      gfx::ImageSkia* value = window->GetProperty(aura::client::kAppIconKey);
-      root_window->SetProperty(aura::client::kAppIconKey, value);
+      MirrorIcon(window, root_window, aura::client::kAppIconKey);
     } else if (key == aura::client::kAppIdKey) {
       std::string* value = window->GetProperty(aura::client::kAppIdKey);
       root_window->SetProperty(aura::client::kAppIdKey, value);
     } else if (key == aura::client::kDrawAttentionKey) {
       bool value = window->GetProperty(aura::client::kDrawAttentionKey);
       root_window->SetProperty(aura::client::kDrawAttentionKey, value);
     } else if (key == aura::client::kTitleKey) {
       base::string16* value = window->GetProperty(aura::client::kTitleKey);
       root_window->SetProperty(aura::client::kTitleKey, value);
     } else if (key == aura::client::kWindowIconKey) {
-      gfx::ImageSkia* value = window->GetProperty(aura::client::kWindowIconKey);
-      root_window->SetProperty(aura::client::kWindowIconKey, value);
+      MirrorIcon(window, root_window, aura::client::kWindowIconKey);
     }
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MusPropertyMirrorAsh);
 };
 
 ChromeBrowserMainExtraPartsAsh::ChromeBrowserMainExtraPartsAsh() {}
 
 ChromeBrowserMainExtraPartsAsh::~ChromeBrowserMainExtraPartsAsh() {}
@@ skipping 72 matching lines @@
   vpn_list_forwarder_.reset();
   volume_controller_.reset();
   new_window_client_.reset();
   system_tray_client_.reset();
   media_client_.reset();
   cast_config_client_media_router_.reset();
   session_controller_client_.reset();
 
   chrome::CloseAsh();
 }