Use chrome app favicons in the ChromeOS shelf app window list.

chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.cc

 // Copyright 2014 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/ash/launcher/app_window_launcher_item_controller.h"
 
 #include "apps/app_window.h"
 #include "apps/ui/native_app_window.h"
 #include "ash/shelf/shelf_model.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "chrome/browser/extensions/webstore_install_with_prompt.h"
+#include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_v2app.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.h"
 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h"
 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h"
 #include "content/public/browser/web_contents.h"
 #include "skia/ext/image_operations.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/events/event.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/wm/core/window_animations.h"
 
 using apps::AppWindow;
 
 namespace {
 
 // Size of the icon in the shelf launcher in display-independent pixels.
 const int kAppListIconSize = 24;
 
 // This will return a slightly smaller icon than the app icon to be used in
 // the application list menu.
-scoped_ptr<gfx::Image> GetAppListIcon(AppWindow* app_window) {
+gfx::Image GetAppListIcon(AppWindow* app_window) {
   // TODO(skuhne): We instead might want to use LoadImages in
   // AppWindow::UpdateExtensionAppIcon() to let the extension give us
   // pre-defined icons in the launcher and the launcher list sizes. Since there
   // is no mock yet, doing this now seems a bit premature and we scale for the
   // time being.
   if (app_window->app_icon().IsEmpty())
-    return make_scoped_ptr(new gfx::Image());
+    return gfx::Image();
 
   SkBitmap bmp =
       skia::ImageOperations::Resize(*app_window->app_icon().ToSkBitmap(),
                                     skia::ImageOperations::RESIZE_BEST,
                                     kAppListIconSize,
                                     kAppListIconSize);
-  return make_scoped_ptr(
-      new gfx::Image(gfx::ImageSkia::CreateFrom1xBitmap(bmp)));
+  return gfx::Image(gfx::ImageSkia::CreateFrom1xBitmap(bmp));
 }
 
 // Returns true if the app window is visible on screen, i.e. not hidden or
 // minimized.
 bool IsAppWindowVisible(AppWindow* app_window) {
   return app_window &&
          !app_window->is_hidden() &&
          !app_window->GetBaseWindow()->IsMinimized();
 }
 
@@ skipping 132 matching lines @@
 
 ChromeLauncherAppMenuItems AppWindowLauncherItemController::GetApplicationList(
     int event_flags) {
   ChromeLauncherAppMenuItems items;
   items.push_back(new ChromeLauncherAppMenuItem(GetTitle(), NULL, false));
   int index = 0;
   for (AppWindowList::iterator iter = app_windows_.begin();
        iter != app_windows_.end();
        ++iter) {
     AppWindow* app_window = *iter;
-    scoped_ptr<gfx::Image> image(GetAppListIcon(app_window));
+
+    // If the app's web contents provides a favicon, use it. Otherwise, use a
+    // scaled down app icon.
+    FaviconTabHelper* favicon_tab_helper =
+        FaviconTabHelper::FromWebContents(app_window->web_contents());
+    gfx::Image result = favicon_tab_helper->GetFavicon();
+    if (result.IsEmpty())
+      result = GetAppListIcon(app_window);
+
     items.push_back(new ChromeLauncherAppMenuItemV2App(
         app_window->GetTitle(),
-        image.get(),  // Will be copied
+        &result,  // Will be copied
         app_id(),
         launcher_controller(),
         index,
         index == 0 /* has_leading_separator */));
     ++index;
   }
   return items.Pass();
 }
 
 bool AppWindowLauncherItemController::ItemSelected(const ui::Event& event) {
@@ skipping 102 matching lines @@
   }
   if (window_to_show->GetBaseWindow()->IsActive()) {
     // Coming here, only a single window is active. For keyboard activations
     // the window gets animated.
     AnimateWindow(window_to_show->GetNativeWindow(),
                   wm::WINDOW_ANIMATION_TYPE_BOUNCE);
   } else {
     ShowAndActivateOrMinimize(window_to_show);
   }
 }