| Index: chrome/browser/download/download_manager.h
|
| ===================================================================
|
| --- chrome/browser/download/download_manager.h (revision 21811)
|
| +++ chrome/browser/download/download_manager.h (working copy)
|
| @@ -108,7 +108,6 @@
|
| const FilePath& path,
|
| int path_uniquifier,
|
| const GURL& url,
|
| - const std::string& mime_type,
|
| const FilePath& original_name,
|
| const base::Time start_time,
|
| int64 download_size,
|
| @@ -185,7 +184,6 @@
|
| int path_uniquifier() const { return path_uniquifier_; }
|
| void set_path_uniquifier(int uniquifier) { path_uniquifier_ = uniquifier; }
|
| GURL url() const { return url_; }
|
| - std::string mime_type() const { return mime_type_; }
|
| int64 total_bytes() const { return total_bytes_; }
|
| void set_total_bytes(int64 total_bytes) { total_bytes_ = total_bytes; }
|
| int64 received_bytes() const { return received_bytes_; }
|
| @@ -235,9 +233,6 @@
|
| // The URL from whence we came.
|
| GURL url_;
|
|
|
| - // The mimetype of the download
|
| - std::string mime_type_;
|
| -
|
| // Total bytes expected
|
| int64 total_bytes_;
|
|
|
|
|
| Property changes on: chrome\browser\download\download_manager.h
|
| ___________________________________________________________________
|
| Modified: svn:mergeinfo
|
| Reverse-merged /branches/chrome_webkit_merge_branch/chrome/browser/download/download_manager.h:r69-2775
|
| Reverse-merged /trunk/src/chrome/browser/download/download_manager.h:r21321,21612
|
|
|
|
|