Move extension/app default icon into src/extensions

athena/content/content_app_model_builder.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 "athena/content/public/content_app_model_builder.h"
 
 #include "athena/activity/public/activity_factory.h"
 #include "athena/activity/public/activity_manager.h"
 #include "athena/extensions/public/extensions_delegate.h"
 #include "extensions/browser/extension_icon_image.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension_set.h"
 #include "extensions/common/manifest_handlers/icons_handler.h"
+#include "extensions/grit/extensions_browser_resources.h"
 #include "ui/app_list/app_list_item.h"
 #include "ui/app_list/app_list_model.h"
+#include "ui/base/resource/resource_bundle.h"
 
 namespace athena {
 
 namespace {
 
 gfx::ImageSkia CreateFlatColorImage(SkColor color) {
   SkBitmap bitmap;
   bitmap.allocN32Pixels(extension_misc::EXTENSION_ICON_MEDIUM,
                         extension_misc::EXTENSION_ICON_MEDIUM);
   bitmap.eraseColor(color);
@@ skipping 32 matching lines @@
  public:
   AppItem(scoped_refptr<const extensions::Extension> extension,
           content::BrowserContext* browser_context)
       : app_list::AppListItem(extension->id()),
         extension_(extension),
         browser_context_(browser_context),
         icon_image_(browser_context_,
                     extension.get(),
                     extensions::IconsInfo::GetIcons(extension.get()),
                     extension_misc::EXTENSION_ICON_MEDIUM,
-                    // TODO(mukai): better default icon
-                    CreateFlatColorImage(SK_ColorBLACK),
+                    *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+                        IDR_APP_DEFAULT_ICON),
                     NULL) {
     icon_image_.image_skia().EnsureRepsForSupportedScales();
     SetIcon(icon_image_.image_skia(), false);
     SetName(extension->name());
   }
 
  private:
   // Overridden from app_list::AppListItem:
   virtual void Activate(int event_flags) OVERRIDE {
     ExtensionsDelegate::Get(browser_context_)->LaunchApp(extension_->id());
@@ skipping 38 matching lines @@
       "video", GURL("http://youtube.com/"), SK_ColorGREEN, browser_context_)));
   model->AddItem(scoped_ptr<app_list::AppListItem>(new DummyItem(
       "music", GURL("http://play.google.com/music"),
       SK_ColorYELLOW, browser_context_)));
   model->AddItem(scoped_ptr<app_list::AppListItem>(new DummyItem(
       "contact", GURL("https://www.google.com/contacts"),
       SK_ColorCYAN, browser_context_)));
 }
 
 }  // namespace athena