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

ash/shell/window_watcher.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 "ash/shell/window_watcher.h"
 
 #include "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
@@ skipping 34 matching lines @@
 void WindowWatcher::OnWindowAdded(aura::Window* new_window) {
   if (new_window->type() != aura::client::WINDOW_TYPE_NORMAL &&
       new_window->type() != aura::client::WINDOW_TYPE_PANEL)
     return;
 
   static int image_count = 0;
   ash::LauncherModel* model = ash::Shell::GetInstance()->launcher()->model();
   ash::LauncherItem item;
   item.type = ash::TYPE_TABBED;
   id_to_window_[model->next_id()] = new_window;
-  item.image.setConfig(SkBitmap::kARGB_8888_Config, 16, 16);
-  item.image.allocPixels();
-  item.image.eraseARGB(255,
-                       image_count == 0 ? 255 : 0,
-                       image_count == 1 ? 255 : 0,
-                       image_count == 2 ? 255 : 0);
+
+  SkBitmap icon_bitmap;
+  icon_bitmap.setConfig(SkBitmap::kARGB_8888_Config, 16, 16);
+  icon_bitmap.allocPixels();
+  icon_bitmap.eraseARGB(255,
+                        image_count == 0 ? 255 : 0,
+                        image_count == 1 ? 255 : 0,
+                        image_count == 2 ? 255 : 0);
   image_count = (image_count + 1) % 3;
+  item.image = gfx::ImageSkia(gfx::ImageSkiaRep(icon_bitmap,
+                                                ui::SCALE_FACTOR_NONE));
+
   model->Add(item);
 }
 
 void WindowWatcher::OnWillRemoveWindow(aura::Window* window) {
   for (IDToWindow::iterator i = id_to_window_.begin();
        i != id_to_window_.end(); ++i) {
     if (i->second == window) {
       ash::LauncherModel* model =
           ash::Shell::GetInstance()->launcher()->model();
       int index = model->ItemIndexByID(i->first);
       DCHECK_NE(-1, index);
       model->RemoveItemAt(index);
       id_to_window_.erase(i);
       break;
     }
   }
 }
 
 }  // namespace shell
 }  // namespace ash