NOT FOR REVIEW: Aura on Android

chrome/browser/download/download_ui_controller.cc

Index: chrome/browser/download/download_ui_controller.cc
diff --git a/chrome/browser/download/download_ui_controller.cc b/chrome/browser/download/download_ui_controller.cc
index ae197a84cb20182f7f4803728ad6b461202d9264..93a3c3b31a56340c9d0170cd26ec904c9322259f 100644
--- a/chrome/browser/download/download_ui_controller.cc
+++ b/chrome/browser/download/download_ui_controller.cc
@@ -16,7 +16,7 @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !defined(USE_AURA)
 #include "content/public/browser/android/download_controller_android.h"
 #else
 #include "chrome/browser/download/notification/download_notification_manager.h"
@@ -30,7 +30,7 @@ namespace {
 // DownloadShelfUIControllerDelegate{Android,} is used when a
 // DownloadUIController is
 // constructed without specifying an explicit Delegate.
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !defined(USE_AURA)
 
 class AndroidUIControllerDelegate : public DownloadUIController::Delegate {
  public:
@@ -105,7 +105,7 @@ DownloadUIController::DownloadUIController(content::DownloadManager* manager,
     : download_notifier_(manager, this),
       delegate_(delegate.Pass()) {
   if (!delegate_) {
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !defined(USE_AURA)
     delegate_.reset(new AndroidUIControllerDelegate());
 #else
     // The delegate should not be invoked after the profile has gone away. This
@@ -147,7 +147,7 @@ void DownloadUIController::OnDownloadUpdated(content::DownloadManager* manager,
 
   DownloadItemModel(item).SetWasUINotified(true);
 
-#if !defined(OS_ANDROID)
+#if !defined(OS_ANDROID) || defined(USE_AURA)
   content::WebContents* web_contents = item->GetWebContents();
   if (web_contents) {
     Browser* browser = chrome::FindBrowserWithWebContents(web_contents);