diff options
author | Ben Murdoch <benm@google.com> | 2013-07-17 14:55:54 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2013-07-17 14:55:54 +0100 |
commit | 7dbb3d5cf0c15f500944d211057644d6a2f37371 (patch) | |
tree | 701119ba0596f51b0ab466d6472b0f98211359c5 /content/browser/download/download_create_info.h | |
parent | b2ecf4836a0eb284ddac7746b1f7ba613777a739 (diff) | |
download | chromium_org-7dbb3d5cf0c15f500944d211057644d6a2f37371.tar.gz |
Merge from Chromium at DEPS revision r212014
This commit was generated by merge_to_master.py.
Change-Id: Ie0f261e9682cd8abea1eea1e51beab83d5eea21a
Diffstat (limited to 'content/browser/download/download_create_info.h')
-rw-r--r-- | content/browser/download/download_create_info.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/content/browser/download/download_create_info.h b/content/browser/download/download_create_info.h index e602128159..4326b2428b 100644 --- a/content/browser/download/download_create_info.h +++ b/content/browser/download/download_create_info.h @@ -14,11 +14,10 @@ #include "content/browser/download/download_file.h" #include "content/browser/download/download_request_handle.h" #include "content/common/content_export.h" -#include "content/public/browser/download_id.h" #include "content/public/browser/download_save_info.h" #include "content/public/common/page_transition_types.h" -#include "googleurl/src/gurl.h" #include "net/base/net_log.h" +#include "url/gurl.h" namespace content { @@ -51,8 +50,8 @@ struct CONTENT_EXPORT DownloadCreateInfo { // The total download size. int64 total_bytes; - // The (per-session) ID of the download. - DownloadId download_id; + // The ID of the download. + uint32 download_id; // True if the download was initiated by user action. bool has_user_gesture; |