| Index: chrome/browser/android/webapps/add_to_homescreen_data_fetcher.h
|
| diff --git a/chrome/browser/android/webapps/add_to_homescreen_data_fetcher.h b/chrome/browser/android/webapps/add_to_homescreen_data_fetcher.h
|
| index d02b94576e07aa3f981ee13c89db80f71d8d2554..789d2c4cf234532f4fe3d91c8cd5f4d334eb1c58 100644
|
| --- a/chrome/browser/android/webapps/add_to_homescreen_data_fetcher.h
|
| +++ b/chrome/browser/android/webapps/add_to_homescreen_data_fetcher.h
|
| @@ -7,13 +7,13 @@
|
|
|
| #include "base/callback_forward.h"
|
| #include "base/macros.h"
|
| +#include "base/memory/ref_counted.h"
|
| #include "base/task/cancelable_task_tracker.h"
|
| #include "base/timer/timer.h"
|
| #include "chrome/browser/android/shortcut_info.h"
|
| -#include "chrome/common/web_application_info.h"
|
| #include "components/favicon_base/favicon_types.h"
|
| #include "content/public/browser/web_contents_observer.h"
|
| -#include "content/public/common/manifest.h"
|
| +#include "third_party/skia/include/core/SkBitmap.h"
|
|
|
| namespace content {
|
| class WebContents;
|
| @@ -24,6 +24,8 @@ class Message;
|
| }
|
|
|
| class GURL;
|
| +struct InstallableData;
|
| +struct WebApplicationInfo;
|
|
|
| // Aysnchronously fetches and processes data needed to create a shortcut for an
|
| // Android Home screen launcher.
|
| @@ -70,10 +72,6 @@ class AddToHomescreenDataFetcher
|
| // IPC message received when the initialization is finished.
|
| void OnDidGetWebApplicationInfo(const WebApplicationInfo& web_app_info);
|
|
|
| - // Called when the Manifest has been parsed, or if no Manifest was found.
|
| - void OnDidGetManifest(const GURL& manifest_url,
|
| - const content::Manifest& manifest);
|
| -
|
| // Accessors, etc.
|
| void set_weak_observer(Observer* observer) { weak_observer_ = observer; }
|
| bool is_ready() { return is_ready_; }
|
| @@ -91,14 +89,13 @@ class AddToHomescreenDataFetcher
|
| void OnFaviconFetched(
|
| const favicon_base::FaviconRawBitmapResult& bitmap_result);
|
|
|
| + // Called when InstallableManager finishes looking for a manifest and icon.
|
| + void OnDidPerformInstallableCheck(const InstallableData& data);
|
| +
|
| // Creates the launcher icon from the given bitmap.
|
| void CreateLauncherIcon(
|
| const favicon_base::FaviconRawBitmapResult& bitmap_result);
|
|
|
| - // Callback run after an attempt to download manifest icon has been made. May
|
| - // kick off the download of a favicon if it failed (i.e. the bitmap is empty).
|
| - void OnManifestIconFetched(const GURL& icon_url, const SkBitmap& icon);
|
| -
|
| // Notifies the observer that the shortcut data is all available.
|
| void NotifyObserver(const SkBitmap& icon);
|
|
|
| @@ -112,7 +109,7 @@ class AddToHomescreenDataFetcher
|
| bool is_waiting_for_web_application_info_;
|
| bool is_icon_saved_;
|
| bool is_ready_;
|
| - base::Timer icon_timeout_timer_;
|
| + base::Timer data_timeout_timer_;
|
| ShortcutInfo shortcut_info_;
|
| GURL splash_screen_url_;
|
|
|
|
|