Fix JS to pass through drop data from bookmark bar. Don't put

chrome/browser/ui/webui/ntp/app_launcher_handler.cc

 // Copyright (c) 2011 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 683 matching lines @@
 
   string16 title;
   CHECK(args->GetString(1, &title));
 
   GURL launch_url(url);
 
   scoped_ptr<WebApplicationInfo> web_app(new WebApplicationInfo);
   web_app->is_bookmark_app = true;
   web_app->title = title;
   web_app->app_url = launch_url;
-  WebApplicationInfo::IconInfo icon;
-  icon.url = GURL();
-  icon.width = icon.height = 16;
-  web_app->icons.push_back(icon);
 
   Profile* profile = web_ui_->GetProfile();
   FaviconService* favicon_service =
       profile->GetFaviconService(Profile::EXPLICIT_ACCESS);
   if (!favicon_service) {
     LOG(ERROR) << "No favicon service";
     scoped_refptr<CrxInstaller> installer(
         extension_service_->MakeCrxInstaller(NULL));
     installer->InstallWebApp(*web_app);
     return;
@@ skipping 16 matching lines @@
       static_cast<extension_misc::AppLaunchBucket>(static_cast<int>(source));
   CHECK(source < extension_misc::APP_LAUNCH_BUCKET_BOUNDARY);
 
   RecordAppLaunchByURL(web_ui_->GetProfile(), url, bucket);
 }
 
 void AppLauncherHandler::OnFaviconForApp(FaviconService::Handle handle,
                                          history::FaviconData data) {
   scoped_ptr<WebApplicationInfo> web_app(
       favicon_consumer_.GetClientDataForCurrentRequest());
-  CHECK(!web_app->icons.empty());
+  WebApplicationInfo::IconInfo icon;
+  web_app->icons.push_back(icon);
   if (data.is_valid() && gfx::PNGCodec::Decode(data.image_data->front(),
                                                data.image_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(
       extension_service_->MakeCrxInstaller(NULL));
   installer->InstallWebApp(*web_app);
 }
 
 // static
 void AppLauncherHandler::RegisterUserPrefs(PrefService* pref_service) {
   // TODO(csilv): We will want this to be a syncable preference instead.
@@ skipping 152 matching lines @@
 
 void AppLauncherHandler::UninstallDefaultApps() {
   AppsPromo* apps_promo = extension_service_->apps_promo();
   const ExtensionIdSet& app_ids = apps_promo->old_default_apps();
   for (ExtensionIdSet::const_iterator iter = app_ids.begin();
        iter != app_ids.end(); ++iter) {
     if (extension_service_->GetExtensionById(*iter, true))
       extension_service_->UninstallExtension(*iter, false, NULL);
   }
 }