content/browser/download/download_item_impl.h - Issue 16994004: Remove DownloadItem::Is*() in favor of DI::GetState()

Side by Side Diff: content/browser/download/download_item_impl.h

Issue 16994004: Remove DownloadItem::Is*() in favor of DI::GetState() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@di-getstate-2

Patch Set: Rebased to fix new test, applied suggestions from bauerb and benjhayden Created 7 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « content/browser/android/download_controller_android_impl.cc ('k') | content/browser/download/download_item_impl.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_ITEM_IMPL_H_	5 #ifndef CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_ITEM_IMPL_H_

6 #define CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_ITEM_IMPL_H_	6 #define CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_ITEM_IMPL_H_

7	7

8 #include <string>	8 #include <string>

9	9

10 #include "base/basictypes.h"	10 #include "base/basictypes.h"

(...skipping 89 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
100 virtual void OpenDownload() OVERRIDE;	100 virtual void OpenDownload() OVERRIDE;

101 virtual void ShowDownloadInShell() OVERRIDE;	101 virtual void ShowDownloadInShell() OVERRIDE;

102 virtual int32 GetId() const OVERRIDE;	102 virtual int32 GetId() const OVERRIDE;

103 virtual DownloadId GetGlobalId() const OVERRIDE;	103 virtual DownloadId GetGlobalId() const OVERRIDE;

104 virtual DownloadState GetState() const OVERRIDE;	104 virtual DownloadState GetState() const OVERRIDE;

105 virtual DownloadInterruptReason GetLastReason() const OVERRIDE;	105 virtual DownloadInterruptReason GetLastReason() const OVERRIDE;

106 virtual bool IsPaused() const OVERRIDE;	106 virtual bool IsPaused() const OVERRIDE;

107 virtual bool IsTemporary() const OVERRIDE;	107 virtual bool IsTemporary() const OVERRIDE;

108 virtual bool CanResume() const OVERRIDE;	108 virtual bool CanResume() const OVERRIDE;

109 virtual bool IsDone() const OVERRIDE;	109 virtual bool IsDone() const OVERRIDE;

110 virtual bool IsInProgress() const OVERRIDE;

111 virtual bool IsCancelled() const OVERRIDE;

112 virtual bool IsInterrupted() const OVERRIDE;

113 virtual bool IsComplete() const OVERRIDE;

114 virtual const GURL& GetURL() const OVERRIDE;	110 virtual const GURL& GetURL() const OVERRIDE;

115 virtual const std::vector<GURL>& GetUrlChain() const OVERRIDE;	111 virtual const std::vector<GURL>& GetUrlChain() const OVERRIDE;

116 virtual const GURL& GetOriginalUrl() const OVERRIDE;	112 virtual const GURL& GetOriginalUrl() const OVERRIDE;

117 virtual const GURL& GetReferrerUrl() const OVERRIDE;	113 virtual const GURL& GetReferrerUrl() const OVERRIDE;

118 virtual std::string GetSuggestedFilename() const OVERRIDE;	114 virtual std::string GetSuggestedFilename() const OVERRIDE;

119 virtual std::string GetContentDisposition() const OVERRIDE;	115 virtual std::string GetContentDisposition() const OVERRIDE;

120 virtual std::string GetMimeType() const OVERRIDE;	116 virtual std::string GetMimeType() const OVERRIDE;

121 virtual std::string GetOriginalMimeType() const OVERRIDE;	117 virtual std::string GetOriginalMimeType() const OVERRIDE;

122 virtual std::string GetRemoteAddress() const OVERRIDE;	118 virtual std::string GetRemoteAddress() const OVERRIDE;

123 virtual bool HasUserGesture() const OVERRIDE;	119 virtual bool HasUserGesture() const OVERRIDE;

(...skipping 407 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
531 const net::BoundNetLog bound_net_log_;	527 const net::BoundNetLog bound_net_log_;

532	528

533 base::WeakPtrFactory<DownloadItemImpl> weak_ptr_factory_;	529 base::WeakPtrFactory<DownloadItemImpl> weak_ptr_factory_;

534	530

535 DISALLOW_COPY_AND_ASSIGN(DownloadItemImpl);	531 DISALLOW_COPY_AND_ASSIGN(DownloadItemImpl);

536 };	532 };

537	533

538 } // namespace content	534 } // namespace content

539	535

540 #endif // CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_ITEM_IMPL_H_	536 #endif // CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_ITEM_IMPL_H_

OLD	NEW