NOT FOR REVIEW: Aura on Android

chrome/browser/download/download_ui_controller.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/download/download_ui_controller.h"
 
 #include "base/callback.h"
 #include "base/stl_util.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_shelf.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "content/public/browser/download_item.h"
 #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"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/host_desktop.h"
 #endif
 
 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:
   AndroidUIControllerDelegate() {}
   ~AndroidUIControllerDelegate() override {}
 
  private:
   // DownloadUIController::Delegate
   void OnNewDownloadReady(content::DownloadItem* item) override;
 };
@@ skipping 54 matching lines @@
 } // namespace
 
 DownloadUIController::Delegate::~Delegate() {
 }
 
 DownloadUIController::DownloadUIController(content::DownloadManager* manager,
                                            scoped_ptr<Delegate> delegate)
     : 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
     // should be the case since DownloadUIController is owned by
     // DownloadService, which in turn is a profile keyed service.
     if (DownloadNotificationManager::IsEnabled()) {
       delegate_.reset(new DownloadNotificationManager(
           Profile::FromBrowserContext(manager->GetBrowserContext())));
     } else {
       delegate_.reset(new DownloadShelfUIControllerDelegate(
@@ skipping 21 matching lines @@
   // download.
   if (item_model.WasUINotified() || !item_model.ShouldNotifyUI())
     return;
 
   // Wait until the target path is determined.
   if (item->GetTargetFilePath().empty())
     return;
 
   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);
     // If the download occurs in a new tab, and it's not a save page
     // download (started before initial navigation completed) close it.
     // Avoid calling CloseContents if the tab is not in this browser's tab strip
     // model; this can happen if the download was initiated by something
     // internal to Chrome, such as by the app list.
     if (browser && web_contents->GetController().IsInitialNavigation() &&
         browser->tab_strip_model()->count() > 1 &&
         browser->tab_strip_model()->GetIndexOfWebContents(web_contents) !=
             TabStripModel::kNoTab &&
         !item->IsSavePackageDownload()) {
       web_contents->Close();
     }
   }
 #endif
 
   delegate_->OnNewDownloadReady(item);
 }