Adding status info to DownloadUIItem and piping it through.

components/offline_pages/core/downloads/download_ui_adapter.h

 // Copyright 2016 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 COMPONENTS_OFFLINE_PAGES_CORE_DOWNLOADS_DOWNLOAD_UI_ADAPTER_H_
 #define COMPONENTS_OFFLINE_PAGES_CORE_DOWNLOADS_DOWNLOAD_UI_ADAPTER_H_
 
 #include <map>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/observer_list.h"
 #include "base/supports_user_data.h"
+#include "components/offline_pages/core/background/request_coordinator.h"
 #include "components/offline_pages/core/downloads/download_ui_item.h"
 #include "components/offline_pages/core/offline_page_model.h"
 #include "components/offline_pages/core/offline_page_types.h"
 #include "url/gurl.h"
 
 namespace offline_pages {
 // C++ side of the UI Adapter. Mimics DownloadManager/Item/History (since we
 // share UI with Downloads).
 // An instance of this class is owned by OfflinePageModel and is shared between
 // UI components if needed. It manages the cache of DownloadUIItems, so after
 // initial load the UI components can synchronously pull the whoel list or any
 // item by its guid.
 class DownloadUIAdapter : public OfflinePageModel::Observer,
+                          public RequestCoordinator::Observer,
                           public base::SupportsUserData::Data {
  public:
+  // Delegate, used to customize behavior of this Adapter.
+  class Delegate {
+   public:
+    virtual ~Delegate() = default;
+    // Returns true if the page or request with the specified Client Id should
+    // be visible in the collection of items exposed by this Adapter. This also
+    // indicates if Observers will be notified about changes for the given page.
+    virtual bool IsVisibleInUI(const ClientId& client_id) = 0;

[dewittj, 2017/01/18 18:49:48]

Eventually I will need a way to ask the DownloadUIAdapter to reevaluate certain
client IDs - in particular during startup when tabs are being added that have
legitimate recent tabs.  So probably long-term an enum of "VISIBLE" "DISABLED"
"INVISIBLE" would be better than a bool.  WE can do this in a future patch.

[Dmitry Titov, 2017/01/27 04:30:22]

Done.

+  };
+
   // Observer, normally implemented by UI or a Bridge.
   class Observer {
    public:
     // Invoked when UI items are loaded. GetAllItems/GetItem can now be used.
     // Must be listened for in order to start getting the items.
     // If the items are already loaded by the time observer is added, this
     // callback will be posted right away.
     virtual void ItemsLoaded() = 0;
 
     // Invoked when the UI Item was added, usually as a request to download.
     virtual void ItemAdded(const DownloadUIItem& item) = 0;
 
     // Invoked when the UI Item was updated. Only guid of the item is guaranteed
     // to survive the update, all other fields can change.
     virtual void ItemUpdated(const DownloadUIItem& item) = 0;
 
     // Invoked when the UI Item was deleted. At this point, only guid remains.
     virtual void ItemDeleted(const std::string& guid) = 0;
 
    protected:
     virtual ~Observer() = default;
   };
 
-  explicit DownloadUIAdapter(OfflinePageModel* model);
+  explicit DownloadUIAdapter(OfflinePageModel* model,
+                             RequestCoordinator* coordinator,
+                             std::unique_ptr<Delegate> delegate);
   ~DownloadUIAdapter() override;
 
-  static DownloadUIAdapter* FromOfflinePageModel(
-      OfflinePageModel* offline_page_model);
-
-  // Checks a client ID for proper namespace and ID format to be shown in the
-  // Downloads Home UI.
-  bool IsVisibleInUI(const ClientId& page);
-
-  // This adapter is potentially shared by UI elements, each of which adds
+    // This adapter is potentially shared by UI elements, each of which adds
   // itself as an observer.
   // When the last observer si removed, cached list of items is destroyed and
   // next time the initial loading will take longer.
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
   // Returns all UI items. The list contains references to items in the cache
   // and has to be used synchronously.
   std::vector<const DownloadUIItem*> GetAllItems() const;
   // May return nullptr if item with specified guid does not exist.
   const DownloadUIItem* GetItem(const std::string& guid) const;
 
   // Commands from UI. Start async operations, result is observable
   // via Observer or directly by the user (as in 'open').
   void DeleteItem(const std::string& guid);
   int64_t GetOfflineIdByGuid(const std::string& guid) const;
 
   // OfflinePageModel::Observer
   void OfflinePageModelLoaded(OfflinePageModel* model) override;
   void OfflinePageAdded(OfflinePageModel* model,
                         const OfflinePageItem& added_page) override;
   void OfflinePageDeleted(int64_t offline_id,
                           const ClientId& client_id) override;
 
+  // RequestCoordinator::Observer
+  void OnAdded(const SavePageRequest& request) override;
+  void OnCompleted(const SavePageRequest& request,
+                   RequestNotifier::BackgroundSavePageResult status) override;
+  void OnChanged(const SavePageRequest& request) override;
+
  private:
-  enum class State { NOT_LOADED, LOADING, LOADED };
+  enum class State {
+    NOT_LOADED,
+    LOADING_PAGES,
+    LOADING_REQUESTS,
+    LOADED
+  };
 
   struct ItemInfo {
     explicit ItemInfo(const OfflinePageItem& page);
+    explicit ItemInfo(const SavePageRequest& request);
     ~ItemInfo();
 
     std::unique_ptr<DownloadUIItem> ui_item;
+
     // Additional cached data, not exposed to UI through DownloadUIItem.
+    // Indicates if this item wraps the completed page or in-progress request.
+    bool is_request;
+
+    // These are shared between pages and requests.
     int64_t offline_id;
 
    private:
     DISALLOW_COPY_AND_ASSIGN(ItemInfo);
   };
 
   typedef std::map<std::string, std::unique_ptr<ItemInfo>> DownloadUIItems;
 
   void LoadCache();
   void ClearCache();
 
   // Task callbacks.
   void OnOfflinePagesLoaded(const MultipleOfflinePageItemResult& pages);
+  void OnRequestsLoaded(std::vector<std::unique_ptr<SavePageRequest>> requests);
+
   void NotifyItemsLoaded(Observer* observer);
   void OnDeletePagesDone(DeletePageResult result);
 
+  void addItemHelper(std::unique_ptr<ItemInfo> item_info);

[dewittj, 2017/01/18 18:49:48]

nit: capital A, also next line.

[Dmitry Titov, 2017/01/27 04:30:22]

Done.

+  void deleteItemHelper(const std::string& guid);
+
   // Always valid, this class is a member of the model.
   OfflinePageModel* model_;
 
+  // Always valid, a service.

[Pete Williamson, 2017/01/17 18:27:34]

Should we note that this pointer is unowned?

[Dmitry Titov, 2017/01/27 04:30:23]

It is a raw pointer, so unowned... The comment says it's a service (valid
always).

+  RequestCoordinator* request_coordinator_;
+
+  // A delegate, supplied at construction.
+  std::unique_ptr<Delegate> delegate_;
+
   State state_;
 
   // The cache of UI items. The key is DownloadUIItem.guid.
   DownloadUIItems items_;
 
   // The observers.
   base::ObserverList<Observer> observers_;
   int observers_count_;
 
   base::WeakPtrFactory<DownloadUIAdapter> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadUIAdapter);
 };
 
 }  // namespace offline_pages
 
 #endif  // COMPONENTS_OFFLINE_PAGE_DOWNLOADS_DOWNLOAD_UI_ADAPTER_H_