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

ash/mus/bridge/wm_window_mus.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/mus/bridge/wm_window_mus.h"
 
 #include "ash/common/shelf/shelf_item_types.h"
 #include "ash/common/wm/container_finder.h"
 #include "ash/common/wm/window_positioning_utils.h"
 #include "ash/common/wm/window_state.h"
@@ skipping 89 matching lines @@
   }
   return ui::mojom::ShowState::DEFAULT;
 }
 
 // Returns the WmWindowProperty enum value for the given ui::Window key name.
 WmWindowProperty WmWindowPropertyFromUI(const std::string& ui_window_key) {
   if (ui_window_key == ui::mojom::WindowManager::kAlwaysOnTop_Property)
     return WmWindowProperty::ALWAYS_ON_TOP;
   if (ui_window_key == ui::mojom::WindowManager::kExcludeFromMru_Property)
     return WmWindowProperty::EXCLUDE_FROM_MRU;
-  if (ui_window_key == ui::mojom::WindowManager::kShelfIconResourceId_Property)
-    return WmWindowProperty::SHELF_ICON_RESOURCE_ID;
   if (ui_window_key == ui::mojom::WindowManager::kShelfItemType_Property)
     return WmWindowProperty::SHELF_ITEM_TYPE;
   return WmWindowProperty::INVALID_PROPERTY;
 }
 
 }  // namespace
 
 WmWindowMus::WmWindowMus(ui::Window* window)
     : window_(window),
       // Matches aura, see aura::Window for details.
@@ skipping 296 matching lines @@
 }
 
 int WmWindowMus::GetIntProperty(WmWindowProperty key) {
   if (key == WmWindowProperty::MODAL_TYPE) {
     // TODO: WindowTree::SetModalWindow() needs to route through WindowManager
     // so wm can position. http://crbug.com/645996.
     NOTIMPLEMENTED();
     return static_cast<int>(ui::MODAL_TYPE_NONE);
   }
 
-  if (key == WmWindowProperty::SHELF_ICON_RESOURCE_ID) {
-    if (window_->HasSharedProperty(
-            ui::mojom::WindowManager::kShelfIconResourceId_Property)) {
-      return window_->GetSharedProperty<int>(
-          ui::mojom::WindowManager::kShelfIconResourceId_Property);
-    }
-    // Mash provides a default shelf icon image.
-    // TODO(msw): Support icon resource ids and bitmaps:
-    // mojo::Array<uint8_t> app_icon = GetWindowAppIcon(window_);
-    return IDR_DEFAULT_FAVICON;
-  }
-
   if (key == WmWindowProperty::SHELF_ID) {
     if (window_->HasSharedProperty(
             ui::mojom::WindowManager::kShelfId_Property)) {
       return window_->GetSharedProperty<int>(
           ui::mojom::WindowManager::kShelfId_Property);
     }
 
     return kInvalidShelfID;
   }
 
@@ skipping 12 matching lines @@
     // TODO: need support for TOP_VIEW_INSET: http://crbug.com/615100.
     NOTIMPLEMENTED();
     return 0;
   }
 
   NOTREACHED();
   return 0;
 }
 
 void WmWindowMus::SetIntProperty(WmWindowProperty key, int value) {
-  if (key == WmWindowProperty::SHELF_ICON_RESOURCE_ID) {
-    window_->SetSharedProperty<int>(
-        ui::mojom::WindowManager::kShelfIconResourceId_Property, value);
-    return;
-  }
-
   if (key == WmWindowProperty::SHELF_ID) {
     window_->SetSharedProperty<int>(ui::mojom::WindowManager::kShelfId_Property,
                                     value);
     return;
   }
 
   if (key == WmWindowProperty::SHELF_ITEM_TYPE) {
     window_->SetSharedProperty<int>(
         ui::mojom::WindowManager::kShelfItemType_Property, value);
     return;
@@ skipping 575 matching lines @@
 }
 
 void WmWindowMus::OnTransientChildRemoved(ui::Window* window,
                                           ui::Window* transient) {
   for (auto& observer : transient_observers_)
     observer.OnTransientChildRemoved(this, Get(transient));
 }
 
 }  // namespace mus
 }  // namespace ash