Add support to download web store promo logos over https.

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 434 matching lines @@
   // CreateAppInfo can change the extension prefs.
   AutoReset<bool> auto_reset(&ignore_changes_, true);
   CreateAppInfo(extension,
                 notification_manager->GetLast(extension->id()),
                 extension_service_,
                 app_info);
   return app_info;
 }
 
 void AppLauncherHandler::FillPromoDictionary(DictionaryValue* dictionary) {
-  dictionary->SetString("promoHeader", AppsPromo::GetPromoHeaderText());
-  dictionary->SetString("promoButton", AppsPromo::GetPromoButtonText());
-  dictionary->SetString("promoLink", AppsPromo::GetPromoLink().spec());
-  dictionary->SetString("promoLogo", AppsPromo::GetPromoLogo().spec());
-  dictionary->SetString("promoExpire", AppsPromo::GetPromoExpireText());
+  AppsPromo::PromoData data = AppsPromo::GetPromo();
+  dictionary->SetString("promoHeader", data.header);
+  dictionary->SetString("promoButton", data.button);
+  dictionary->SetString("promoLink", data.link.spec());
+  dictionary->SetString("promoLogo", data.logo.spec());
+  dictionary->SetString("promoExpire", data.expire);
 }
 
 void AppLauncherHandler::HandleGetApps(const ListValue* args) {
   DictionaryValue dictionary;
 
   // Tell the client whether to show the promo for this view. We don't do this
   // in the case of PREF_CHANGED because:
   //
   // a) At that point in time, depending on the pref that changed, it can look
   //    like the set of apps installed has changed, and we will mark the promo
@@ skipping 526 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);
   }
 }