Implement manifest icon downloader

chrome/browser/banners/app_banner_data_fetcher.cc

 // Copyright 2015 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/banners/app_banner_data_fetcher.h"
 
 #include "base/bind.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/banners/app_banner_debug_log.h"
@@ skipping 61 matching lines @@
 AppBannerDataFetcher::AppBannerDataFetcher(
     content::WebContents* web_contents,
     base::WeakPtr<Delegate> delegate,
     int ideal_icon_size)
     : WebContentsObserver(web_contents),
       ideal_icon_size_(ideal_icon_size),
       weak_delegate_(delegate),
       is_active_(false),
       was_canceled_by_page_(false),
       page_requested_prompt_(false),
-      event_request_id_(-1) {
+      event_request_id_(-1),
+      icon_downloader_(new ManifestIconDownloader(web_contents)) {
 }
 
 void AppBannerDataFetcher::Start(const GURL& validated_url,
                                  ui::PageTransition transition_type) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   content::WebContents* web_contents = GetWebContents();
   DCHECK(web_contents);
 
   is_active_ = true;
@@ skipping 118 matching lines @@
   if (!web_contents() || web_contents()->IsBeingDestroyed())
     return nullptr;
   return web_contents();
 }
 
 std::string AppBannerDataFetcher::GetAppIdentifier() {
   DCHECK(!web_app_data_.IsEmpty());
   return web_app_data_.start_url.spec();
 }
 
-bool AppBannerDataFetcher::FetchIcon(const GURL& image_url) {
-  content::WebContents* web_contents = GetWebContents();
-  DCHECK(web_contents);
-
-  // Begin asynchronously fetching the app icon.  AddRef() is done before the
-  // fetch to ensure that the AppBannerDataFetcher isn't deleted before the
-  // BitmapFetcher has called OnFetchComplete() (where the references are
-  // decremented).
-  AddRef();
-  Profile* profile =
-      Profile::FromBrowserContext(web_contents->GetBrowserContext());
-  bitmap_fetcher_.reset(new chrome::BitmapFetcher(image_url, this));
-  bitmap_fetcher_->Init(
-      profile->GetRequestContext(),
-      std::string(),
-      net::URLRequest::CLEAR_REFERRER_ON_TRANSITION_FROM_SECURE_TO_INSECURE,
-      net::LOAD_NORMAL);
-  bitmap_fetcher_->Start();
-  return true;
-}
-
 void AppBannerDataFetcher::RecordDidShowBanner(const std::string& event_name) {
   content::WebContents* web_contents = GetWebContents();
   DCHECK(web_contents);
 
   AppBannerSettingsHelper::RecordBannerEvent(
       web_contents, validated_url_, GetAppIdentifier(),
       AppBannerSettingsHelper::APP_BANNER_EVENT_DID_SHOW,
       GetCurrentTime());
   rappor::SampleDomainAndRegistryFromGURL(g_browser_process->rappor_service(),
                                           event_name,
@@ skipping 57 matching lines @@
 
 void AppBannerDataFetcher::OnDidCheckHasServiceWorker(
     bool has_service_worker) {
   content::WebContents* web_contents = GetWebContents();
   if (!CheckFetcherIsStillAlive(web_contents)) {
     Cancel();
     return;
   }
 
   if (has_service_worker) {
-    // Create an infobar to promote the manifest's app.
-    GURL icon_url =
-        ManifestIconSelector::FindBestMatchingIcon(
-            web_app_data_.icons,
-            ideal_icon_size_,
-            gfx::Screen::GetScreenFor(web_contents->GetNativeView()));
-    if (!icon_url.is_empty()) {
-      FetchIcon(icon_url);
-      return;
-    }
-    OutputDeveloperNotShownMessage(web_contents, kCannotDetermineBestIcon);
-  } else {
-    TrackDisplayEvent(DISPLAY_EVENT_LACKS_SERVICE_WORKER);
-    OutputDeveloperNotShownMessage(web_contents, kNoMatchingServiceWorker);
+    OnHasServiceWorker(web_contents);
+    return;
   }
 
+  TrackDisplayEvent(DISPLAY_EVENT_LACKS_SERVICE_WORKER);
+  OutputDeveloperNotShownMessage(web_contents, kNoMatchingServiceWorker);
   Cancel();
 }
 
-void AppBannerDataFetcher::OnFetchComplete(const GURL& url,
-                                           const SkBitmap* icon) {
-  if (is_active_)
-    RequestShowBanner(icon);
+void AppBannerDataFetcher::OnHasServiceWorker(
+    content::WebContents* web_contents) {
+  GURL icon_url =
+    ManifestIconSelector::FindBestMatchingIcon(
+        web_app_data_.icons,
+        ideal_icon_size_,
+        gfx::Screen::GetScreenFor(web_contents->GetNativeView()));
 
-  Release();
+  if (FetchAppIcon(web_contents, icon_url)) return;
+
+  OutputDeveloperNotShownMessage(web_contents, kCannotDetermineBestIcon);
+  Cancel();
 }
 
-bool AppBannerDataFetcher::IsWebAppInstalled(
-    content::BrowserContext* browser_context,
-    const GURL& start_url) {
-  return false;
+bool AppBannerDataFetcher::FetchAppIcon(content::WebContents* web_contents,
+                                        const GURL& icon_url) {
+  return icon_downloader_->Download(

[mlamouri (slow - plz ping), 2015/08/05 08:20:16]

nit: add DCHECK(web_contents);

[Lalit Maganti, 2015/08/05 14:47:13]

Removed web contents altogether.

+      icon_url,
+      ideal_icon_size_,
+      base::Bind(&AppBannerDataFetcher::OnAppIconFetched,
+                 this));
 }
 
-void AppBannerDataFetcher::RequestShowBanner(const SkBitmap* icon) {
+void AppBannerDataFetcher::OnAppIconFetched(const SkBitmap& bitmap) {
+  if (!is_active_) return;
+
   content::WebContents* web_contents = GetWebContents();
   if (!CheckFetcherIsStillAlive(web_contents)) {
     Cancel();
     return;
   }
-  if (!icon) {
+  if (bitmap.drawsNothing()) {
     OutputDeveloperNotShownMessage(web_contents, kNoIconAvailable);
     Cancel();
     return;
   }
-
   RecordCouldShowBanner();
   if (!CheckIfShouldShowBanner()) {
     // At this point, the only possible case is that the banner has been added
     // to the homescreen, given all of the other checks that have been made.
     OutputDeveloperNotShownMessage(web_contents, kBannerAlreadyAdded);
     Cancel();
     return;
   }
 
-  app_icon_.reset(new SkBitmap(*icon));
+  app_icon_.reset(new SkBitmap(icon));
   event_request_id_ = ++gCurrentRequestID;
   web_contents->GetMainFrame()->Send(
       new ChromeViewMsg_AppBannerPromptRequest(
-          web_contents->GetMainFrame()->GetRoutingID(),
-          event_request_id_,
-          GetBannerType()));
+        web_contents->GetMainFrame()->GetRoutingID(),
+        event_request_id_,
+        GetBannerType()));
+}
+
+bool AppBannerDataFetcher::IsWebAppInstalled(
+    content::BrowserContext* browser_context,
+    const GURL& start_url) {
+  return false;
 }
 
 void AppBannerDataFetcher::RecordCouldShowBanner() {
   content::WebContents* web_contents = GetWebContents();
   DCHECK(web_contents);
 
   AppBannerSettingsHelper::RecordBannerCouldShowEvent(
       web_contents, validated_url_, GetAppIdentifier(),
       GetCurrentTime(), transition_type_);
 }
@@ skipping 37 matching lines @@
     return false;
   }
   if (!DoesManifestContainRequiredIcon(manifest)) {
     OutputDeveloperNotShownMessage(web_contents, kManifestMissingSuitableIcon);
     return false;
   }
   return true;
 }
 
 }  // namespace banners