Revert 110765 - Fix DownloadTests and change cros/aura to use shelf

chrome/browser/ui/browser.cc

 // Copyright (c) 2011 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/ui/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // OS_WIN
@@ skipping 166 matching lines @@
 #include "ui/base/win/shell.h"
 #endif  // OS_WIN
 
 #if defined(OS_MACOSX)
 #include "content/browser/find_pasteboard.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/boot_times_loader.h"
 #include "chrome/browser/ui/webui/active_downloads_ui.h"
-#endif
-
-#if !defined(OS_CHROMEOS) || defined(USE_AURA)
+#else
 #include "chrome/browser/download/download_shelf.h"
 #endif
 
 #if defined(FILE_MANAGER_EXTENSION)
 #include "chrome/browser/extensions/file_manager_util.h"
 #endif
 
 using base::TimeDelta;
 
 ///////////////////////////////////////////////////////////////////////////////
@@ skipping 1232 matching lines @@
   // On Mac, fullscreen mode has most normal things (in a slide-down panel). On
   // other platforms, we hide some controls when in fullscreen mode.
   bool hide_ui_for_fullscreen = false;
 #if !defined(OS_MACOSX)
   hide_ui_for_fullscreen = check_fullscreen && window_ &&
       window_->IsFullscreen();
 #endif
 
   unsigned int features = FEATURE_INFOBAR | FEATURE_SIDEBAR;
 
-#if !defined(OS_CHROMEOS) || defined(USE_AURA)
+#if !defined(OS_CHROMEOS)
   // Chrome OS opens a FileBrowse pop up instead of using download shelf.
   // So FEATURE_DOWNLOADSHELF is only added for non-chromeos platforms.
   features |= FEATURE_DOWNLOADSHELF;
-#endif  // !defined(OS_CHROMEOS) || defined(USE_AURA)
+#endif  // !defined(OS_CHROMEOS)
 
   if (is_type_tabbed())
     features |= FEATURE_BOOKMARKBAR;
 
   if (!hide_ui_for_fullscreen) {
     if (!is_type_tabbed())
       features |= FEATURE_TITLEBAR;
 
     if (is_type_tabbed())
       features |= FEATURE_TABSTRIP;
@@ skipping 2262 matching lines @@
     // Download in a constrained popup is shown in the tab that opened it.
     TabContents* constrained_tab = constrained->tab_contents();
     constrained_tab->delegate()->OnStartDownload(constrained_tab, download);
     return;
   }
 
   if (!window())
     return;
 
   if (DisplayOldDownloadsUI()) {
-#if defined(OS_CHROMEOS) && !defined(USE_AURA)
+#if defined(OS_CHROMEOS)
     // Don't show content browser for extension/theme downloads from gallery.
     ExtensionService* service = profile_->GetExtensionService();
     if (!ChromeDownloadManagerDelegate::IsExtensionDownload(download) ||
         (service == NULL) ||
         !service->IsDownloadFromGallery(download->GetURL(),
                                         download->referrer_url())) {
       // Open the Active Downloads ui for chromeos.
       ActiveDownloadsUI::OpenPopup(profile_);
     }
-#else
+#elif !defined(USE_AURA)
     // GetDownloadShelf creates the download shelf if it was not yet created.
     DownloadShelf* shelf = window()->GetDownloadShelf();
     shelf->AddDownload(new DownloadItemModel(download));
     // Don't show the animation for "Save file" downloads.
     // For non-theme extensions, we don't show the download animation.
     // Show animation in same window as the download shelf. Download shelf
     // may not be in the same window that initiated the download, e.g.
     // Panels.
     // Don't show the animation if the selected tab is not visible (i.e. the
     // window is minimized, we're in a unit test, etc.).
     TabContents* shelf_tab = shelf->browser()->GetSelectedTabContents();
     if ((download->total_bytes() > 0) &&
         !ChromeDownloadManagerDelegate::IsExtensionDownload(download) &&
         platform_util::IsVisible(shelf_tab->GetNativeView()) &&
         ui::Animation::ShouldRenderRichAnimation()) {
       DownloadStartedAnimation::Show(shelf_tab);
     }
-#else
-    // TODO(jamescook): Downloads UI for non-ChromeOS Aura, crbug.com/103488
-    NOTIMPLEMENTED();
 #endif
   }
 
   // If the download occurs in a new tab, close it.
   if (source->controller().IsInitialNavigation() && tab_count() > 1)
     CloseContents(source);
 }
 
 void Browser::ShowPageInfo(content::BrowserContext* browser_context,
                            const GURL& url,
@@ skipping 1757 matching lines @@
 }
 
 void Browser::UpdateFullscreenExitBubbleContent() {
   GURL url;
   if (fullscreened_tab_)
     url = fullscreened_tab_->tab_contents()->GetURL();
 
   window_->UpdateFullscreenExitBubbleContent(
       url, GetFullscreenExitBubbleType());
 }