Make the download manager compile on Linux & Mac.
Review URL: http://codereview.chromium.org/19711
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8971 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/download/download_manager.h b/chrome/browser/download/download_manager.h
index 6f05e02..f718094 100644
--- a/chrome/browser/download/download_manager.h
+++ b/chrome/browser/download/download_manager.h
@@ -275,9 +275,6 @@
// DownloadManager -------------------------------------------------------------
-#if defined(OS_WIN)
-// TODO(port): Port this part of the header and remove the #ifdef.
-
// Browser's download manager: manages all downloads and destination view.
class DownloadManager : public base::RefCountedThreadSafe<DownloadManager>,
public SelectFileDialog::Listener {
@@ -534,8 +531,7 @@
scoped_refptr<URLRequestContext> request_context_;
// Used for history service request management.
- CancelableRequestConsumerT<Observer*, (DownloadManager::Observer*)NULL>
- cancelable_consumer_;
+ CancelableRequestConsumerTSimple<Observer*> cancelable_consumer_;
// Non-owning pointer for handling file writing on the download_thread_.
DownloadFileManager* file_manager_;
@@ -576,6 +572,4 @@
DISALLOW_COPY_AND_ASSIGN(DownloadManager);
};
-#endif // defined(OS_WIN)
-
#endif // CHROME_BROWSER_DOWNLOAD_DOWNLOAD_MANAGER_H_
