Implement manifest icon downloader

chrome/browser/banners/app_banner_data_fetcher.h

 // 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.
 
 #ifndef CHROME_BROWSER_BANNERS_APP_BANNER_DATA_FETCHER_H_
 #define CHROME_BROWSER_BANNERS_APP_BANNER_DATA_FETCHER_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/time/time.h"
-#include "chrome/browser/bitmap_fetcher/bitmap_fetcher_delegate.h"
+#include "chrome/browser/manifest/manifest_icon_downloader.h"
 #include "chrome/common/web_application_info.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/manifest.h"
 #include "third_party/WebKit/public/platform/modules/app_banner/WebAppBannerPromptReply.h"
 
 namespace chrome {
 class BitmapFetcher;
 }  // namespace chrome
 
 namespace infobars {
 class InfoBar;
 }  // namespace infobars
 
 namespace banners {
 class AppBannerDataFetcher;
 
 // Fetches data required to show a web app banner for the URL currently shown by
 // the WebContents.
 class AppBannerDataFetcher
     : public base::RefCounted<AppBannerDataFetcher>,
-      public chrome::BitmapFetcherDelegate,
       public content::WebContentsObserver {
  public:
   class Observer {
    public:
     virtual void OnDecidedWhetherToShow(AppBannerDataFetcher* fetcher,
                                         bool will_show) = 0;
     virtual void OnFetcherDestroyed(AppBannerDataFetcher* fetcher) = 0;
   };
 
   class Delegate {
@@ skipping 67 matching lines @@
   // opportunity to cancel.
   void OnBannerPromptReply(content::RenderFrameHost* render_frame_host,
                            int request_id,
                            blink::WebAppBannerPromptReply reply);
 
   // Called when the client has prevented a banner from being shown, and is
   // now requesting that it be shown later.
   void OnRequestShowAppBanner(content::RenderFrameHost* render_frame_host,
                               int request_id);
 
+  // Called when it is determined that the webapp has fulfilled the intial

[gone, 2015/08/19 22:21:07]

nit: initial

[Lalit Maganti, 2015/08/20 16:48:00]

Done.

+  // criteria of having a manifest and a service worker.
+  void OnHasServiceWorker(content::WebContents* web_contents);
+
   content::WebContents* GetWebContents();
   virtual std::string GetAppIdentifier();
   const content::Manifest& web_app_data() { return web_app_data_; }
   void set_app_title(const base::string16& title) { app_title_ = title; }
   int event_request_id() { return event_request_id_; }
+  const scoped_ptr<ManifestIconDownloader>& icon_downloader() {
+    return icon_downloader_;
+  }
 
   // Fetches the icon at the given URL asynchronously, returning |false| if a
   // load could not be started.
-  bool FetchIcon(const GURL& image_url);
+  bool FetchAppIcon(content::WebContents* web_contents, const GURL& url);
 
   // Records that a banner was shown. The |event_name| corresponds to the RAPPOR
   // metric being recorded.
   void RecordDidShowBanner(const std::string& event_name);
 
  private:
   // Callbacks for data retrieval.
   void OnDidGetManifest(const content::Manifest& manifest);
   void OnDidCheckHasServiceWorker(bool has_service_worker);
-  void OnFetchComplete(const GURL& url, const SkBitmap* icon) override;
+  void OnAppIconFetched(const SkBitmap& bitmap);
 
   // Returns whether the given web app has already been installed.
   // Implemented on desktop platforms only.
   virtual bool IsWebAppInstalled(content::BrowserContext* browser_context,
                                  const GURL& start_url);
 
-  // Shows a banner for the app, if the given |icon| is valid.
-  virtual void RequestShowBanner(const SkBitmap* icon);
-
   // Record that the banner could be shown at this point, if the triggering
   // heuristic allowed.
   void RecordCouldShowBanner();
 
   // Creates a banner for the app using the given |icon|.
   virtual void ShowBanner(const SkBitmap* icon,
                           const base::string16& title) = 0;
 
   // Returns whether the banner should be shown.
   bool CheckIfShouldShowBanner();
 
   // Returns whether the fetcher is active and web contents have not been
   // closed.
   bool CheckFetcherIsStillAlive(content::WebContents* web_contents);
 
   // Returns whether the given Manifest is following the requirements to show
   // a web app banner.
   static bool IsManifestValidForWebApp(const content::Manifest& manifest,
                                        content::WebContents* web_contents);
 
   const int ideal_icon_size_;
   const base::WeakPtr<Delegate> weak_delegate_;
   base::ObserverList<Observer> observer_list_;
   bool is_active_;
   bool was_canceled_by_page_;
   bool page_requested_prompt_;
   ui::PageTransition transition_type_;
   int event_request_id_;
-  scoped_ptr<chrome::BitmapFetcher> bitmap_fetcher_;
+  scoped_ptr<ManifestIconDownloader> icon_downloader_;
   scoped_ptr<SkBitmap> app_icon_;
 
   GURL validated_url_;
   base::string16 app_title_;
   content::Manifest web_app_data_;
 
   friend class AppBannerDataFetcherUnitTest;
   friend class base::RefCounted<AppBannerDataFetcher>;
   DISALLOW_COPY_AND_ASSIGN(AppBannerDataFetcher);
 };
 
 }  // namespace banners
 
 #endif  // CHROME_BROWSER_BANNERS_APP_BANNER_DATA_FETCHER_H_