Implement deleteItem and openItem on OfflinePageDownloadBridge.

components/offline_pages/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_PAGE_DOWNLOADS_DOWNLOAD_UI_ADAPTER_H_
 #define COMPONENTS_OFFLINE_PAGE_DOWNLOADS_DOWNLOAD_UI_ADAPTER_H_
 
 #include <map>
 #include <memory>
 #include <string>

[fgorski, 2016/08/12 15:43:52]

#include <vector>

[Dmitry Titov, 2016/08/12 19:43:37]

Done.

 
 #include "base/observer_list.h"
 #include "base/supports_user_data.h"
 #include "components/offline_pages/downloads/download_ui_item.h"
 #include "components/offline_pages/offline_page_model.h"
 #include "components/offline_pages/offline_page_types.h"
+#include "url/gurl.h"
 
 namespace offline_pages {
-
-// Key is DownloadUIItem.guid.
-typedef
-    std::map<std::string, std::unique_ptr<DownloadUIItem>> DownloadUIItemsMap;
-
 // 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 base::SupportsUserData::Data {
  public:
   // Observer, normally implemented by UI or a Bridge.
@@ skipping 25 matching lines @@
   static DownloadUIAdapter* FromOfflinePageModel(
       OfflinePageModel* offline_page_model);
 
   // 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);
 
-  const DownloadUIItemsMap& GetAllItems() const;
-  // May return nullptr.
+  // 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);
+  std::string GetOfflineUrlByGuid(const std::string& guid) const;
+
   // OfflinePageModel::Observer
   void OfflinePageModelLoaded(OfflinePageModel* model) override;
   void OfflinePageModelChanged(OfflinePageModel* model) override;
   void OfflinePageDeleted(int64_t offline_id,
                           const ClientId& client_id) override;
 
  private:
+  struct ItemInfo {
+    ItemInfo(const OfflinePageItem& page);
+    ~ItemInfo();

[fgorski, 2016/08/12 15:43:52]

= default; would probably do here.

[Dmitry Titov, 2016/08/12 19:43:37]

Apparently, the 'complex types must have non-inline destructors' according to
clang.

+
+    std::unique_ptr<DownloadUIItem> ui_item;

[fgorski, 2016/08/12 15:43:52]

do we need to do anything about copying of these objects?

[Dmitry Titov, 2016/08/12 19:43:37]

Done.

+    // Additional cached data, not exposed to UI through DownloadUIItem.
+    int64_t offline_id;
+    GURL offline_url;
+  };
+
+  typedef std::map<std::string, std::unique_ptr<ItemInfo>> DownloadUIItems;
+
   void LoadCache();
   void ClearCache();
 
   // Task callbacks.
   void OnOfflinePagesLoaded(const MultipleOfflinePageItemResult& pages);
   void NotifyItemsLoaded(Observer* observer);
   void OnOfflinePagesChanged(const MultipleOfflinePageItemResult& pages);
+  void OnDeletePagesDone(DeletePageResult result);
+
   bool IsVisibleInUI(const OfflinePageItem& page);
 
   // Always valid, this class is a member of the model.
   OfflinePageModel* model_;
 
   bool is_loaded_;
 
-  // The cache of UI items.
-  DownloadUIItemsMap items_;
+  // The cache of UI items. The key is DownloadUIItem.guid.
+  DownloadUIItems items_;
 
   // The observers.
   base::ObserverList<Observer> observers_;
 
   base::WeakPtrFactory<DownloadUIAdapter> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadUIAdapter);
 };
 
 }  // namespace offline_pages
 
 #endif  // COMPONENTS_OFFLINE_PAGE_DOWNLOADS_DOWNLOAD_UI_ADAPTER_H_