--downloads-new-ui completely disables the download 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 3373 matching lines @@
   if (download->is_extension_install()) {
     ExtensionService* service = profile_->GetExtensionService();
     if (service && service->IsDownloadFromGallery(download->GetURL(),
                                                   download->referrer_url())) {
       return;
     }
   }
   // Open the Active Downloads ui for chromeos.
   ActiveDownloadsUI::OpenPopup(profile_);
 #else
-  // GetDownloadShelf creates the download shelf if it was not yet created.
-  DownloadShelf* shelf = window()->GetDownloadShelf();
-  shelf->AddDownload(new DownloadItemModel(download));
+  if (!CommandLine::ForCurrentProcess()->HasSwitch(
+        switches::kDisableDownloadShelf)) {
+    // 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.
-  if (download->total_bytes() <= 0)
-    return;
+    // Don't show the animation for "Save file" downloads.
+    if (download->total_bytes() > 0) {

[cbentzel, 2011/08/10 11:54:54]

This is different behavior from before - now the two lines at the end of the
function will be called in this case. Is that OK?

[benjhayden, 2011/08/10 17:09:17]

Right, that's the bug fix part of this CL. It seems to me like we want to close
the blank temporary tab even for savepages and non-theme extensions. I quickly
tested this to check that it doesn't close non-blank tabs, but we'll see what
the browser_tests say.

+      // For non-theme extensions, we don't show the download animation.
+      if (!download->is_extension_install() ||
+          ExtensionService::IsDownloadFromMiniGallery(download->GetURL())) {

[cbentzel, 2011/08/10 11:54:54]

Same concern here.

[benjhayden, 2011/08/10 17:09:17]

Same answer.

+        // 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.
+        TabContents* shelf_tab = shelf->browser()->GetSelectedTabContents();
 
-  // For non-theme extensions, we don't show the download animation.
-  if (download->is_extension_install() &&
-      !ExtensionService::IsDownloadFromMiniGallery(download->GetURL()))
-    return;
-
-  // 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.
-  TabContents* shelf_tab = shelf->browser()->GetSelectedTabContents();
-
-  // We make this check for the case of minimized windows, unit tests, etc.
-  if (platform_util::IsVisible(shelf_tab->GetNativeView()) &&
-      ui::Animation::ShouldRenderRichAnimation()) {
-    DownloadStartedAnimation::Show(shelf_tab);
+        // We make this check for the case of minimized windows, unit tests,
+        // etc.
+        if (platform_util::IsVisible(shelf_tab->GetNativeView()) &&
+            ui::Animation::ShouldRenderRichAnimation()) {
+          DownloadStartedAnimation::Show(shelf_tab);
+        }
+      }
+    }
   }
 #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 1415 matching lines @@
 }
 
 void Browser::ShowSyncSetup() {
   ProfileSyncService* service =
       profile()->GetOriginalProfile()->GetProfileSyncService();
   if (service->HasSyncSetupCompleted())
     ShowOptionsTab(chrome::kSyncSetupSubPage);
   else
     service->ShowLoginDialog();
 }