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

ash/aura/wm_window_aura.cc

 // Copyright 2016 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/aura/wm_window_aura.h"
 
 #include "ash/aura/aura_layout_manager_adapter.h"
 #include "ash/aura/wm_root_window_controller_aura.h"
 #include "ash/aura/wm_shell_aura.h"
 #include "ash/common/ash_constants.h"
@@ skipping 315 matching lines @@
     return;
   }
 
   NOTREACHED();
 }
 
 int WmWindowAura::GetIntProperty(WmWindowProperty key) {
   if (key == WmWindowProperty::MODAL_TYPE)
     return window_->GetProperty(aura::client::kModalKey);
 
-  if (key == WmWindowProperty::SHELF_ICON_RESOURCE_ID)
-    return window_->GetProperty(kShelfIconResourceIdKey);
-
   if (key == WmWindowProperty::SHELF_ID)
     return window_->GetProperty(kShelfIDKey);
 
   if (key == WmWindowProperty::SHELF_ITEM_TYPE)
     return window_->GetProperty(kShelfItemTypeKey);
 
   if (key == WmWindowProperty::TOP_VIEW_INSET)
     return window_->GetProperty(aura::client::kTopViewInset);
 
   NOTREACHED();
   return 0;
 }
 
 void WmWindowAura::SetIntProperty(WmWindowProperty key, int value) {
-  if (key == WmWindowProperty::SHELF_ICON_RESOURCE_ID) {
-    window_->SetProperty(kShelfIconResourceIdKey, value);
-    return;
-  }
   if (key == WmWindowProperty::SHELF_ID) {
     window_->SetProperty(kShelfIDKey, value);
     return;
   }
   if (key == WmWindowProperty::SHELF_ITEM_TYPE) {
     window_->SetProperty(kShelfItemTypeKey, value);
     return;
   }
   if (key == WmWindowProperty::TOP_VIEW_INSET) {
     window_->SetProperty(aura::client::kTopViewInset, value);
@@ skipping 510 matching lines @@
   if (key == aura::client::kAlwaysOnTopKey) {
     wm_property = WmWindowProperty::ALWAYS_ON_TOP;
   } else if (key == aura::client::kAppIconKey) {
     wm_property = WmWindowProperty::APP_ICON;
   } else if (key == aura::client::kDrawAttentionKey) {
     wm_property = WmWindowProperty::DRAW_ATTENTION;
   } else if (key == aura::client::kExcludeFromMruKey) {
     wm_property = WmWindowProperty::EXCLUDE_FROM_MRU;
   } else if (key == aura::client::kModalKey) {
     wm_property = WmWindowProperty::MODAL_TYPE;
-  } else if (key == kShelfIconResourceIdKey) {
-    wm_property = WmWindowProperty::SHELF_ICON_RESOURCE_ID;
   } else if (key == kShelfIDKey) {
     wm_property = WmWindowProperty::SHELF_ID;
   } else if (key == kShelfItemTypeKey) {
     wm_property = WmWindowProperty::SHELF_ITEM_TYPE;
   } else if (key == kSnapChildrenToPixelBoundary) {
     wm_property = WmWindowProperty::SNAP_CHILDREN_TO_PIXEL_BOUNDARY;
   } else if (key == aura::client::kTopViewInset) {
     wm_property = WmWindowProperty::TOP_VIEW_INSET;
   } else if (key == aura::client::kWindowIconKey) {
     wm_property = WmWindowProperty::WINDOW_ICON;
@@ skipping 45 matching lines @@
     observer.OnTransientChildAdded(this, Get(transient));
 }
 
 void WmWindowAura::OnTransientChildRemoved(aura::Window* window,
                                            aura::Window* transient) {
   for (auto& observer : transient_observers_)
     observer.OnTransientChildRemoved(this, Get(transient));
 }
 
 }  // namespace ash