diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-02-16 11:04:13 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-02-21 14:06:38 +0000 |
| commit | 91bf3b3f87c0275ac4e7b1805a74ce931522adda (patch) | |
| tree | ff60df7d0816275a0336cf2ae52ac9d88f422198 /src/core/download_manager_delegate_qt.h | |
| parent | 025952a9673264c3557f6f7c195eebc11892e80a (diff) | |
Fixup merge of downloadType from 5.10.1
In 5.11 we deprecated downloadType and at the same time ripped out most
of the faulty logic. Later we partially fixed the logic in 5.10.1, but
kept the 5.11 version during the merge. This restores the improved logic
from 5.10.1, while keeping the property deprecated since it is still
misleading at times.
Change-Id: I12ee09a2b212506f7ba1a336c9c2e88aa3b1de24
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'src/core/download_manager_delegate_qt.h')
| -rw-r--r-- | src/core/download_manager_delegate_qt.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/download_manager_delegate_qt.h b/src/core/download_manager_delegate_qt.h index dd8ebf6c4..df43211ed 100644 --- a/src/core/download_manager_delegate_qt.h +++ b/src/core/download_manager_delegate_qt.h @@ -86,6 +86,8 @@ public: void pauseDownload(quint32 downloadId); void resumeDownload(quint32 downloadId); + void markNextDownloadAsUserRequested() { m_nextDownloadIsUserRequested = true; } + // Inherited from content::DownloadItem::Observer void OnDownloadUpdated(content::DownloadItem *download) override; void OnDownloadDestroyed(content::DownloadItem *download) override; @@ -97,6 +99,7 @@ private: uint64_t m_currentId; base::WeakPtrFactory<DownloadManagerDelegateQt> m_weakPtrFactory; + bool m_nextDownloadIsUserRequested; friend class DownloadManagerDelegateInstance; DISALLOW_COPY_AND_ASSIGN(DownloadManagerDelegateQt); |