kill --downloads-new-ui

chrome/browser/ui/browser.cc

 // Copyright (c) 2012 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 264 matching lines @@
   *ret_num1 = num1;
   *ret_num2 = num2;
   return true;
 }
 
 bool AllowPanels(const std::string& app_name) {
   return PanelManager::ShouldUsePanels(
       web_app::GetExtensionIdFromApplicationName(app_name));
 }
 
-bool DisplayOldDownloadsUI() {
-  return !CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kDownloadsNewUI);
-}
-
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // Browser, CreateParams:
 
 Browser::CreateParams::CreateParams()
     : type(TYPE_TABBED),
       profile(NULL),
       initial_show_state(ui::SHOW_STATE_DEFAULT),
       is_session_restore(false) {
@@ skipping 2855 matching lines @@
   if (constrained != tab_contents) {
     // Download in a constrained popup is shown in the tab that opened it.
     WebContents* constrained_tab = constrained->web_contents();
     constrained_tab->GetDelegate()->OnStartDownload(constrained_tab, download);
     return;
   }
 
   if (!window())
     return;
 
-  if (DisplayOldDownloadsUI()) {
-    // 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.).
-    WebContents* shelf_tab = shelf->browser()->GetActiveWebContents();
-    if ((download->GetTotalBytes() > 0) &&
-        !download_crx_util::IsExtensionDownload(*download) &&
-        platform_util::IsVisible(shelf_tab->GetNativeView()) &&
-        ui::Animation::ShouldRenderRichAnimation()) {
-      DownloadStartedAnimation::Show(shelf_tab);
-    }
+  // 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.).
+  WebContents* shelf_tab = shelf->browser()->GetActiveWebContents();
+  if ((download->GetTotalBytes() > 0) &&
+      !download_crx_util::IsExtensionDownload(*download) &&
+      platform_util::IsVisible(shelf_tab->GetNativeView()) &&
+      ui::Animation::ShouldRenderRichAnimation()) {
+    DownloadStartedAnimation::Show(shelf_tab);
   }
 
   // If the download occurs in a new tab, close it.
   if (source->GetController().IsInitialNavigation() && tab_count() > 1)
     CloseContents(source);
 }
 
 void Browser::ViewSourceForTab(WebContents* source, const GURL& page_url) {
   DCHECK(source);
   TabContents* tab_contents = GetTabContentsAt(
@@ skipping 1748 matching lines @@
   if (contents && !allow_js_access) {
     contents->web_contents()->GetController().LoadURL(
         target_url,
         content::Referrer(),
         content::PAGE_TRANSITION_LINK,
         std::string());  // No extra headers.
   }
 
   return contents != NULL;
 }