wip

chrome/browser/ui/webui/ntp/app_launcher_handler.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/webui/ntp/app_launcher_handler.h"
 
 #include <string>
 #include <vector>
 
 #include "base/auto_reset.h"
@@ skipping 786 matching lines @@
   scoped_ptr<AppInstallInfo> install_info(
       favicon_consumer_.GetClientDataForCurrentRequest());
   scoped_ptr<WebApplicationInfo> web_app(new WebApplicationInfo());
   web_app->is_bookmark_app = install_info->is_bookmark_app;
   web_app->title = install_info->title;
   web_app->app_url = install_info->app_url;
   web_app->urls.push_back(install_info->app_url);
 
   WebApplicationInfo::IconInfo icon;
   web_app->icons.push_back(icon);
-  if (data.is_valid() && gfx::PNGCodec::Decode(data.bitmap_data->front(),
-                                               data.bitmap_data->size(),
-                                               &(web_app->icons[0].data))) {
+  if (data.is_valid() && data.variants.size() > 0 &&
+      gfx::PNGCodec::Decode(data.variants[0].bitmap_data->front(),
+                            data.variants[0].bitmap_data->size(),
+                            &(web_app->icons[0].data))) {
     web_app->icons[0].url = GURL();
     web_app->icons[0].width = web_app->icons[0].data.width();
     web_app->icons[0].height = web_app->icons[0].data.height();
   } else {
     web_app->icons.clear();
   }
 
   scoped_refptr<CrxInstaller> installer(
       CrxInstaller::Create(extension_service_, NULL));
   installer->set_page_ordinal(install_info->page_ordinal);
@@ skipping 175 matching lines @@
 
 void AppLauncherHandler::UninstallDefaultApps() {
   AppsPromo* apps_promo = extension_service_->apps_promo();
   const extensions::ExtensionIdSet& app_ids = apps_promo->old_default_apps();
   for (extensions::ExtensionIdSet::const_iterator iter = app_ids.begin();
        iter != app_ids.end(); ++iter) {
     if (extension_service_->GetExtensionById(*iter, true))
       extension_service_->UninstallExtension(*iter, false, NULL);
   }
 }