Index: chrome/browser/download/download_extension_api.h |
diff --git a/chrome/browser/download/download_extension_api.h b/chrome/browser/download/download_extension_api.h |
index dea8e6702d69b0337294d01cce2c740f9ae93101..8eeae41d9708eb50effe90f7413b0a865d117555 100644 |
--- a/chrome/browser/download/download_extension_api.h |
+++ b/chrome/browser/download/download_extension_api.h |
@@ -12,6 +12,7 @@ |
#include "base/file_path.h" |
#include "base/memory/singleton.h" |
+#include "base/stl_util.h" |
#include "base/string16.h" |
#include "chrome/browser/extensions/extension_function.h" |
#include "content/browser/download/download_state_info.h" |
@@ -289,24 +290,41 @@ class DownloadsGetFileIconFunction : public AsyncDownloadsFunction { |
DISALLOW_COPY_AND_ASSIGN(DownloadsGetFileIconFunction); |
}; |
-class ExtensionDownloadsEventRouter |
- : public content::DownloadManager::Observer { |
+// Observes a single DownloadManager and many DownloadItems and dispatches |
+// onCreated and onErased events. |
+class ExtensionDownloadsEventRouter : public content::DownloadManager::Observer, |
+ public content::DownloadItem::Observer { |
public: |
explicit ExtensionDownloadsEventRouter(Profile* profile); |
virtual ~ExtensionDownloadsEventRouter(); |
virtual void ModelChanged() OVERRIDE; |
virtual void ManagerGoingDown() OVERRIDE; |
+ virtual void OnDownloadUpdated(content::DownloadItem* download) OVERRIDE; |
+ virtual void OnDownloadOpened(content::DownloadItem* download) OVERRIDE; |
private: |
+ struct OnChangedStat { |
+ OnChangedStat(); |
+ ~OnChangedStat(); |
+ int fires; |
+ int total; |
+ }; |
+ |
+ typedef std::map<int, content::DownloadItem*> ItemMap; |
+ typedef std::map<int, base::DictionaryValue*> ItemJsonMap; |
+ typedef std::map<int, OnChangedStat*> OnChangedStatMap; |
+ |
void Init(content::DownloadManager* manager); |
void DispatchEvent(const char* event_name, base::Value* json_arg); |
- typedef base::hash_map<int, content::DownloadItem*> ItemMap; |
- typedef std::set<int> DownloadIdSet; |
Profile* profile_; |
content::DownloadManager* manager_; |
- DownloadIdSet downloads_; |
+ ItemMap downloads_; |
+ ItemJsonMap item_jsons_; |
+ STLValueDeleter<ItemJsonMap> delete_item_jsons_; |
+ OnChangedStatMap on_changed_stats_; |
+ STLValueDeleter<OnChangedStatMap> delete_on_changed_stats_; |
DISALLOW_COPY_AND_ASSIGN(ExtensionDownloadsEventRouter); |
}; |