Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4747)

Unified Diff: chrome/browser/download/download_util.cc

Issue 7834048: Preliminary work to allow Chrome to build with USE_AURA (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/bookmarks/bookmark_drop_info.cc ('k') | chrome/browser/plugin_download_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/download/download_util.cc
===================================================================
--- chrome/browser/download/download_util.cc (revision 99764)
+++ chrome/browser/download/download_util.cc (working copy)
@@ -71,7 +71,7 @@
#endif // defined(TOOLKIT_GTK)
#endif // defined(TOOLKIT_USES_GTK)
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
#include "base/win/scoped_comptr.h"
#include "chrome/browser/ui/browser_list.h"
#include "chrome/browser/ui/views/frame/browser_view.h"
@@ -391,7 +391,10 @@
download->GetFileNameToReportUser().LossyDisplayName());
}
-#if defined(OS_WIN)
+#if defined(USE_AURA)
+ // TODO(beng):
+ NOTIMPLEMENTED();
+#elif defined(OS_WIN)
scoped_refptr<ui::DragSource> drag_source(new ui::DragSource);
// Run the drag and drop loop
@@ -539,7 +542,10 @@
void UpdateAppIconDownloadProgress(int download_count,
bool progress_known,
float progress) {
-#if defined(OS_WIN)
+#if defined(USE_AURA)
+ // TODO(beng):
+ NOTIMPLEMENTED();
+#elif defined(OS_WIN)
// Taskbar progress bar is only supported on Win7.
if (base::win::GetVersion() < base::win::VERSION_WIN7)
return;
@@ -582,7 +588,7 @@
int GetUniquePathNumberWithCrDownload(const FilePath& path) {
return DownloadFile::GetUniquePathNumberWithSuffix(
- path, FILE_PATH_LITERAL(".crdownload"));
+ path, FILE_PATH_LITERAL(".crdownload"));
}
FilePath GetCrDownloadPath(const FilePath& suggested_path) {
« no previous file with comments | « chrome/browser/bookmarks/bookmark_drop_info.cc ('k') | chrome/browser/plugin_download_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698