chromeos: Fix pixelated icons in app list and launcher (part 1)

chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.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/launcher/chrome_launcher_controller.h"
 
 #include <set>
 #include <vector>
 
 #include "ash/launcher/launcher_model.h"
@@ skipping 327 matching lines @@
     const std::string& app_id) {
   for (IDToItemMap::const_iterator i = id_to_item_map_.begin();
        i != id_to_item_map_.end(); ++i) {
     if (i->second.app_id == app_id)
       return i->first;
   }
   return 0;
 }
 
 void ChromeLauncherController::SetAppImage(const std::string& id,
-                                           const SkBitmap* image) {
+                                           const gfx::ImageSkia& image) {
   // TODO: need to get this working for shortcuts.
 
   for (IDToItemMap::const_iterator i = id_to_item_map_.begin();
        i != id_to_item_map_.end(); ++i) {
     if (i->second.app_id != id)
       continue;
 
     // Panel items may share the same app_id as the app that created them,
     // but they set their icon image in
     // BrowserLauncherItemController::UpdateLauncher(), so do not set panel
     // images here.
     if (i->second.controller &&
         i->second.controller->type() ==
         BrowserLauncherItemController::TYPE_EXTENSION_PANEL) {
       continue;
     }
 
     int index = model_->ItemIndexByID(i->first);
     ash::LauncherItem item = model_->items()[index];
-    item.image = image ? *image : Extension::GetDefaultIcon(true);
+    item.image = image;
     model_->Set(index, item);
     // It's possible we're waiting on more than one item, so don't break.
   }
 }
 
 bool ChromeLauncherController::IsAppPinned(const std::string& app_id) {
   for (IDToItemMap::const_iterator i = id_to_item_map_.begin();
        i != id_to_item_map_.end(); ++i) {
     if (IsPinned(i->first) && i->second.app_id == app_id)
       return true;
@@ skipping 498 matching lines @@
   for (; pref_app_id != pinned_apps.end(); ++pref_app_id)
     CreateAppLauncherItem(NULL, *pref_app_id, ash::STATUS_CLOSED);
 }
 
 TabContents* ChromeLauncherController::GetLastActiveTabContents(
     const std::string& app_id) {
   AppIDToTabContentsListMap::const_iterator i =
       app_id_to_tab_contents_list_.find(app_id);
   if (i == app_id_to_tab_contents_list_.end())
     return NULL;
-  DCHECK(i->second.size() > 0);
+  DCHECK_GT(i->second.size(), 0u);
   return *i->second.begin();
 }
 
 ash::LauncherID ChromeLauncherController::InsertAppLauncherItem(
     BrowserLauncherItemController* controller,
     const std::string& app_id,
     ash::LauncherItemStatus status,
     int index) {
   ash::LauncherID id = model_->next_id();
   DCHECK(id_to_item_map_.find(id) == id_to_item_map_.end());
@@ skipping 35 matching lines @@
   }
   model_->AddAt(index, item);
 
   if (!controller || controller->type() !=
       BrowserLauncherItemController::TYPE_EXTENSION_PANEL) {
     if (item.status != ash::STATUS_IS_PENDING)
       app_icon_loader_->FetchImage(app_id);
   }
   return id;
 }