Call AddToHomescreenDataFetcher::Observer callbacks when manifest fetch times out

chrome/browser/android/webapps/add_to_homescreen_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_ANDROID_WEBAPPS_ADD_TO_HOMESCREEN_DATA_FETCHER_H_
 #define CHROME_BROWSER_ANDROID_WEBAPPS_ADD_TO_HOMESCREEN_DATA_FETCHER_H_
 
 #include "base/callback_forward.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
@@ skipping 55 matching lines @@
   };
 
   // Initialize the fetcher by requesting the information about the page from
   // the renderer process. The initialization is asynchronous and
   // OnDidGetWebApplicationInfo is expected to be called when finished.
   AddToHomescreenDataFetcher(content::WebContents* web_contents,
                              int ideal_icon_size_in_dp,
                              int minimum_icon_size_in_dp,
                              int ideal_splash_image_size_in_dp,
                              int minimum_splash_image_size_in_dp,
-                             bool check_installable,
+                             bool check_webapk_compatible,
                              Observer* observer);
 
   // Returns a callback which fetches the splash screen image to be stored for
   // the webapp with the specified |id|.
   base::Closure FetchSplashScreenImageCallback(const std::string& id);
 
   // IPC message received when the initialization is finished.
   void OnDidGetWebApplicationInfo(const WebApplicationInfo& web_app_info);
 
   // Accessors, etc.
   void set_weak_observer(Observer* observer) { weak_observer_ = observer; }
   bool is_ready() const { return is_ready_; }
   ShortcutInfo& shortcut_info() { return shortcut_info_; }
   const SkBitmap& shortcut_icon() const { return shortcut_icon_; }
 
  private:
   friend class base::RefCounted<AddToHomescreenDataFetcher>;
 
   ~AddToHomescreenDataFetcher() override;
 
-  // WebContentsObserver
+  // WebContentsObserver:
   bool OnMessageReceived(const IPC::Message& message) override;
 
+  // Called if either InstallableManager or the favicon fetch takes too long.
+  void OnTimeout();

[dominickn, 2016/09/19 05:41:44]

Nit: call this OnDataTimedout() to match data_timeout_timer and the general
naming scheme here.

+
   // Called when InstallableManager finishes looking for a manifest and icon.
   void OnDidPerformInstallableCheck(const InstallableData& data);
 
   // Grabs the favicon for the current URL.
   void FetchFavicon();
   void OnFaviconFetched(
       const favicon_base::FaviconRawBitmapResult& bitmap_result);
 
   // Creates the launcher icon from the given bitmap. shortcut_info_.url is
   // used to generate an icon if there is no bitmap in |bitmap_result| or the
   // bitmap is not large enough.
   void CreateLauncherIconFromFaviconInBackground(
       const favicon_base::FaviconRawBitmapResult& bitmap_result);
 
   // Creates the launcher icon from the given |icon|.
+  void CreateLauncherIcon(const SkBitmap& raw__icon);

[dominickn, 2016/09/19 05:41:44]

Nit: two underscores in variable name.

Nit: make the comment match the variable name.

[pkotwicz, 2016/09/19 23:34:02]

You've got good eyes!

__fixed__

   void CreateLauncherIconInBackground(const SkBitmap& raw__icon);
 
   // Notifies the observer that the shortcut data is all available.
   void NotifyObserver(const SkBitmap& icon);
 
   Observer* weak_observer_;
 
   // The icon must only be set on the UI thread for thread safety.
   SkBitmap shortcut_icon_;
   ShortcutInfo shortcut_info_;
   GURL splash_screen_url_;
 
   base::CancelableTaskTracker favicon_task_tracker_;
   base::Timer data_timeout_timer_;
 
   const int ideal_icon_size_in_dp_;
   const int minimum_icon_size_in_dp_;
   const int ideal_splash_image_size_in_dp_;
   const int minimum_splash_image_size_in_dp_;
 
   // Indicates whether to check WebAPK compatibility.
-  bool check_installable_;
-  bool is_waiting_for_installable_check_;
+  bool check_webapk_compatibility_;
   bool is_waiting_for_web_application_info_;
+  bool did_installable_check_;

[dominickn, 2016/09/19 05:41:44]

Nit: is_installable_check_complete_

   bool is_icon_saved_;
   bool is_ready_;
 
   DISALLOW_COPY_AND_ASSIGN(AddToHomescreenDataFetcher);
 };
 
 #endif  // CHROME_BROWSER_ANDROID_WEBAPPS_ADD_TO_HOMESCREEN_DATA_FETCHER_H_