From 7dbb3d5cf0c15f500944d211057644d6a2f37371 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Wed, 17 Jul 2013 14:55:54 +0100 Subject: Merge from Chromium at DEPS revision r212014 This commit was generated by merge_to_master.py. Change-Id: Ie0f261e9682cd8abea1eea1e51beab83d5eea21a --- content/browser/download/download_item_factory.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'content/browser/download/download_item_factory.h') diff --git a/content/browser/download/download_item_factory.h b/content/browser/download/download_item_factory.h index dfc15ec162..36197d5e57 100644 --- a/content/browser/download/download_item_factory.h +++ b/content/browser/download/download_item_factory.h @@ -13,7 +13,6 @@ #include #include "base/memory/scoped_ptr.h" -#include "content/public/browser/download_id.h" #include "content/public/browser/download_item.h" class GURL; @@ -40,7 +39,7 @@ public: virtual DownloadItemImpl* CreatePersistedItem( DownloadItemImplDelegate* delegate, - DownloadId download_id, + uint32 download_id, const base::FilePath& current_path, const base::FilePath& target_path, const std::vector& url_chain, @@ -57,13 +56,13 @@ public: virtual DownloadItemImpl* CreateActiveItem( DownloadItemImplDelegate* delegate, - DownloadId download_id, + uint32 download_id, const DownloadCreateInfo& info, const net::BoundNetLog& bound_net_log) = 0; virtual DownloadItemImpl* CreateSavePageItem( DownloadItemImplDelegate* delegate, - DownloadId download_id, + uint32 download_id, const base::FilePath& path, const GURL& url, const std::string& mime_type, -- cgit v1.2.3