diff options
| author | Primiano Tucci <primiano@google.com> | 2014-09-30 14:45:55 +0100 |
|---|---|---|
| committer | Primiano Tucci <primiano@google.com> | 2014-09-30 14:45:55 +0100 |
| commit | 1320f92c476a1ad9d19dba2a48c72b75566198e9 (patch) | |
| tree | ea7f149ccad687b22c18a72b729646568b2d54fb /content/browser/download/download_item_impl.h | |
| parent | 39b78c562f50ad7d5551ee861121f899239525a2 (diff) | |
| download | chromium_org-1320f92c476a1ad9d19dba2a48c72b75566198e9.tar.gz | |
Merge from Chromium at DEPS revision 267aeeb8d85c
This commit was generated by merge_to_master.py.
Change-Id: Id3aac9713b301fae64408cdaee0888724eeb7c0e
Diffstat (limited to 'content/browser/download/download_item_impl.h')
| -rw-r--r-- | content/browser/download/download_item_impl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content/browser/download/download_item_impl.h b/content/browser/download/download_item_impl.h index 34916ff6fd..5408f1156e 100644 --- a/content/browser/download/download_item_impl.h +++ b/content/browser/download/download_item_impl.h @@ -121,7 +121,7 @@ class CONTENT_EXPORT DownloadItemImpl virtual std::string GetOriginalMimeType() const OVERRIDE; virtual std::string GetRemoteAddress() const OVERRIDE; virtual bool HasUserGesture() const OVERRIDE; - virtual PageTransition GetTransitionType() const OVERRIDE; + virtual ui::PageTransition GetTransitionType() const OVERRIDE; virtual const std::string& GetLastModifiedTime() const OVERRIDE; virtual const std::string& GetETag() const OVERRIDE; virtual bool IsSavePackageDownload() const OVERRIDE; @@ -437,7 +437,7 @@ class CONTENT_EXPORT DownloadItemImpl base::FilePath forced_file_path_; // Page transition that triggerred the download. - PageTransition transition_type_; + ui::PageTransition transition_type_; // Whether the download was triggered with a user gesture. bool has_user_gesture_; |