Move Icons out of Extension class

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

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2013 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/browser_launcher_item_controller.h"
 
 #include "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/web_applications/web_app.h"
+#include "chrome/common/extensions/api/icons/icons_handler.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/ui_resources.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/widget/widget.h"
 
 using extensions::Extension;
 
 BrowserLauncherItemController::BrowserLauncherItemController(
@@ skipping 247 matching lines @@
     extensions::TabHelper* extensions_tab_helper =
         extensions::TabHelper::FromWebContents(tab);
     gfx::ImageSkia new_image = gfx::ImageSkia(favicon_loader_->GetFavicon());
     if (new_image.isNull() && extensions_tab_helper->GetExtensionAppIcon())
       new_image = gfx::ImageSkia(*extensions_tab_helper->GetExtensionAppIcon());
     // Only update the icon if we have a new image, or none has been set yet.
     // This avoids flickering to an empty image when a pinned app is opened.
     if (!new_image.isNull())
       item.image = new_image;
     else if (item.image.isNull())
-      item.image = extensions::Extension::GetDefaultIcon(true);
+      item.image = extensions::IconsInfo::GetDefaultIcon(true);  // is app

[Yoyo Zhou, 2013/01/08 01:26:13]

This is silly. Can we have
GetDefaultAppIcon
GetDefaultExtensionIcon
instead?

[Devlin, 2013/01/16 23:32:29]

Done.

   } else {
     DCHECK_EQ(TYPE_TABBED, type());
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     FaviconTabHelper* favicon_tab_helper =
         FaviconTabHelper::FromWebContents(tab);
     if (favicon_tab_helper->ShouldDisplayFavicon()) {
       item.image = favicon_tab_helper->GetFavicon().AsImageSkia();
       if (item.image.isNull()) {
         item.image = *rb.GetImageSkiaNamed(IDR_DEFAULT_FAVICON);
       }
@@ skipping 17 matching lines @@
       app_state = ChromeLauncherController::APP_STATE_ACTIVE;
   } else {
     app_state = ChromeLauncherController::APP_STATE_INACTIVE;
   }
   launcher_controller()->UpdateAppState(tab, app_state);
 }
 
 ash::LauncherModel* BrowserLauncherItemController::launcher_model() {
   return launcher_controller()->model();
 }