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

ash/common/shelf/shelf_window_watcher.cc

 // Copyright 2013 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/common/shelf/shelf_window_watcher.h"
 
 #include <memory>
 #include <utility>
 
 #include "ash/common/shelf/shelf_constants.h"
 #include "ash/common/shelf/shelf_model.h"
 #include "ash/common/shelf/shelf_window_watcher_item_delegate.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/common/wm_window_property.h"
 #include "ash/public/cpp/shell_window_ids.h"
-#include "ui/base/resource/resource_bundle.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
-#include "ui/gfx/image/image_skia.h"
-#include "ui/resources/grit/ui_resources.h"
 
 namespace ash {
 namespace {
 
 // Update the ShelfItem from relevant window properties.
 void UpdateShelfItemForWindow(ShelfItem* item, WmWindow* window) {
   item->type = static_cast<ShelfItemType>(
       window->GetIntProperty(WmWindowProperty::SHELF_ITEM_TYPE));
 
   item->status = STATUS_RUNNING;
   if (window->IsActive())
     item->status = STATUS_ACTIVE;
   else if (window->GetBoolProperty(WmWindowProperty::DRAW_ATTENTION))
     item->status = STATUS_ATTENTION;
 
   item->app_id = window->GetStringProperty(WmWindowProperty::APP_ID);
 
   // Prefer app icons over window icons, they're typically larger.
-  gfx::ImageSkia image = window->GetAppIcon();
-  if (image.isNull())
-    image = window->GetWindowIcon();
-  if (image.isNull()) {
-    int icon = window->GetIntProperty(WmWindowProperty::SHELF_ICON_RESOURCE_ID);
-    if (icon != kInvalidImageResourceID)
-      image = *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(icon);
-  }
-  item->image = image;
+  item->image = window->GetAppIcon();
+  if (item->image.isNull())
+    item->image = window->GetWindowIcon();
 }
 
 }  // namespace
 
 ShelfWindowWatcher::ContainerWindowObserver::ContainerWindowObserver(
     ShelfWindowWatcher* window_watcher)
     : window_watcher_(window_watcher) {}
 
 ShelfWindowWatcher::ContainerWindowObserver::~ContainerWindowObserver() {}
 
@@ skipping 23 matching lines @@
 
 ShelfWindowWatcher::UserWindowObserver::~UserWindowObserver() {}
 
 void ShelfWindowWatcher::UserWindowObserver::OnWindowPropertyChanged(
     WmWindow* window,
     WmWindowProperty property) {
   if (property == WmWindowProperty::APP_ICON ||
       property == WmWindowProperty::APP_ID ||
       property == WmWindowProperty::DRAW_ATTENTION ||
       property == WmWindowProperty::SHELF_ITEM_TYPE ||
-      property == WmWindowProperty::SHELF_ICON_RESOURCE_ID ||
       property == WmWindowProperty::WINDOW_ICON) {
     window_watcher_->OnUserWindowPropertyChanged(window);
   }
 }
 
 void ShelfWindowWatcher::UserWindowObserver::OnWindowDestroying(
     WmWindow* window) {
   window_watcher_->OnUserWindowDestroying(window);
 }
 
@@ skipping 118 matching lines @@
     observed_container_windows_.Add(panel_container);
 }
 
 void ShelfWindowWatcher::OnDisplayRemoved(const display::Display& old_display) {
 }
 
 void ShelfWindowWatcher::OnDisplayMetricsChanged(const display::Display&,
                                                  uint32_t) {}
 
 }  // namespace ash