Replace IDR window property use with gfx::ImageSkia icons.

chrome/browser/ui/views/task_manager_view.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 "chrome/browser/ui/views/task_manager_view.h"
 
 #include <stddef.h>
 
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 23 matching lines @@
 #include "ui/views/window/dialog_client_view.h"
 
 #if defined(USE_ASH)
 // Note: gn check complains here, despite the correct conditional //ash dep.
 #include "ash/common/shelf/shelf_item_types.h"    // nogncheck
 #include "ash/resources/grit/ash_resources.h"     // nogncheck
 #include "ash/wm/window_properties.h"             // nogncheck
 #include "ash/wm/window_util.h"                   // nogncheck
 #include "chrome/browser/ui/ash/ash_util.h"       // nogncheck
 #include "chrome/browser/ui/ash/property_util.h"  // nogncheck
+#include "ui/aura/client/aura_constants.h"
+#include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/image/image_skia.h"
 #endif  // defined(USE_ASH)
 
 #if defined(OS_WIN)
 #include "chrome/browser/shell_integration_win.h"
 #include "ui/base/win/shell.h"
 #include "ui/views/win/hwnd_util.h"
 #endif  // defined(OS_WIN)
 
 namespace task_manager {
 
@@ skipping 12 matching lines @@
 task_manager::TaskManagerTableModel* TaskManagerView::Show(Browser* browser) {
   if (g_task_manager_view) {
     // If there's a Task manager window open already, just activate it.
     g_task_manager_view->SelectTaskOfActiveTab(browser);
     g_task_manager_view->GetWidget()->Activate();
     return g_task_manager_view->table_model_.get();
   }
 
   g_task_manager_view = new TaskManagerView();
 
-  gfx::NativeWindow window =
+  gfx::NativeWindow context =
       browser ? browser->window()->GetNativeWindow() : nullptr;
 #if defined(USE_ASH)
-  if (!chrome::IsRunningInMash() && !window)
-    window = ash::wm::GetActiveWindow();
+  if (!chrome::IsRunningInMash() && !context)
+    context = ash::wm::GetActiveWindow();
 #endif
 
-  DialogDelegate::CreateDialogWidget(g_task_manager_view, window, nullptr);
+  DialogDelegate::CreateDialogWidget(g_task_manager_view, context, nullptr);
   g_task_manager_view->InitAlwaysOnTopState();
 
 #if defined(OS_WIN)
   // Set the app id for the task manager to the app id of its parent browser. If
   // no parent is specified, the app id will default to that of the initial
   // process.
   if (browser) {
     ui::win::SetAppIdForWindow(
         shell_integration::win::GetChromiumModelIdForProfile(
             browser->profile()->GetPath()),
         views::HWNDForWidget(g_task_manager_view->GetWidget()));
   }
 #endif
 
   g_task_manager_view->SelectTaskOfActiveTab(browser);
   g_task_manager_view->GetWidget()->Show();
 
   // Set the initial focus to the list of tasks.
   views::FocusManager* focus_manager = g_task_manager_view->GetFocusManager();
   if (focus_manager)
     focus_manager->SetFocusedView(g_task_manager_view->tab_table_);
 
 #if defined(USE_ASH)
-  aura::Window* aura_window =
-      g_task_manager_view->GetWidget()->GetNativeWindow();
-  property_util::SetIntProperty(aura_window, ash::kShelfItemTypeKey,
+  aura::Window* window = g_task_manager_view->GetWidget()->GetNativeWindow();
+  property_util::SetIntProperty(window, ash::kShelfItemTypeKey,
                                 ash::TYPE_DIALOG);
-  property_util::SetIntProperty(aura_window, ash::kShelfIconResourceIdKey,
-                                IDR_ASH_SHELF_ICON_TASK_MANAGER);
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+  gfx::ImageSkia* icon = rb.GetImageSkiaNamed(IDR_ASH_SHELF_ICON_TASK_MANAGER);
+  // The new gfx::ImageSkia instance is owned by the window itself.
+  window->SetProperty(aura::client::kWindowIconKey, new gfx::ImageSkia(*icon));
 #endif
   return g_task_manager_view->table_model_.get();
 }
 
 // static
 void TaskManagerView::Hide() {
   if (g_task_manager_view)
     g_task_manager_view->GetWidget()->Close();
 }
 
@@ skipping 240 matching lines @@
   if (!g_browser_process->local_state())
     return;
 
   const base::DictionaryValue* dictionary =
       g_browser_process->local_state()->GetDictionary(GetWindowName());
   if (dictionary)
     dictionary->GetBoolean("always_on_top", &is_always_on_top_);
 }
 
 }  // namespace task_manager