Remove Active Downloads 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 27 matching lines @@
 #include "chrome/browser/chrome_page_zoom.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
 #include "chrome/browser/custom_handlers/register_protocol_handler_infobar_delegate.h"
 #include "chrome/browser/debugger/devtools_toggle_action.h"
 #include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/download/chrome_download_manager_delegate.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
+#include "chrome/browser/download/download_shelf.h"
 #include "chrome/browser/download/download_started_animation.h"
 #include "chrome/browser/download/download_util.h"
 #include "chrome/browser/extensions/browser_extension_window_controller.h"
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/default_apps_trial.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_helper.h"
 #include "chrome/browser/extensions/extension_tabs_module.h"
@@ skipping 140 matching lines @@
 #endif  // OS_WIN
 
 #if defined(OS_MACOSX)
 #include "ui/base/cocoa/find_pasteboard.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/boot_times_loader.h"
 #include "chrome/browser/chromeos/gdata/gdata_util.h"
 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
+#include "chrome/browser/extensions/api/terminal/terminal_extension_helper.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager_client.h"
-#if defined(USE_AURA)
-#include "chrome/browser/extensions/api/terminal/terminal_extension_helper.h"
-#endif
-#include "chrome/browser/ui/webui/chromeos/active_downloads_ui.h"
 #endif
 
 #if defined(USE_ASH)
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
 #include "chrome/browser/ui/views/ash/panel_view_aura.h"
 #endif
 
-#if !defined(OS_CHROMEOS) || defined(USE_AURA)
-#include "chrome/browser/download/download_shelf.h"
-#endif
-
 #if defined(FILE_MANAGER_EXTENSION)
 #include "chrome/browser/chromeos/extensions/file_manager_util.h"
 #endif
 
 using base::TimeDelta;
 using content::NavigationController;
 using content::NavigationEntry;
 using content::OpenURLParams;
 using content::PluginService;
 using content::Referrer;
@@ skipping 76 matching lines @@
   if (!base::StringToInt(str.substr(0, num1_size), &num1) ||
       !base::StringToInt(str.substr(num2_pos, num2_size), &num2))
     return false;
 
   *ret_num1 = num1;
   *ret_num2 = num2;
   return true;
 }
 
 bool AllowPanels(const std::string& app_name) {
-#if (!defined(OS_CHROMEOS) || defined(USE_AURA))
   if (!PanelManager::ShouldUsePanels(
           web_app::GetExtensionIdFromApplicationName(app_name))) {
     return false;
   }
-#endif  // !OS_CHROMEOS || USE_AURA
   return true;
 }
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // Browser, CreateParams:
 
 Browser::CreateParams::CreateParams()
     : type(TYPE_TABBED),
@@ skipping 1300 matching lines @@
 bool Browser::SupportsWindowFeatureImpl(WindowFeature feature,
                                         bool check_fullscreen) const {
   // 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;
-
-#if !defined(OS_CHROMEOS) || defined(USE_AURA)
-  // 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)
+  unsigned int features = (FEATURE_INFOBAR | FEATURE_DOWNLOADSHELF);
 
   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 724 matching lines @@
 void Browser::ShowHistoryTab() {
   content::RecordAction(UserMetricsAction("ShowHistory"));
   browser::NavigateParams params(
       GetSingletonTabNavigateParams(GURL(chrome::kChromeUIHistoryURL)));
   params.path_behavior = browser::NavigateParams::IGNORE_AND_NAVIGATE;
   ShowSingletonTabOverwritingNTP(params);
 }
 
 void Browser::ShowDownloadsTab() {
   content::RecordAction(UserMetricsAction("ShowDownloads"));
-#if !defined(OS_CHROMEOS) || defined(USE_AURA)
-  // ChromiumOS (non-Aura) uses ActiveDownloadsUI instead of of DownloadShelf.
   if (window()) {
     DownloadShelf* shelf = window()->GetDownloadShelf();
     if (shelf->IsShowing())
       shelf->Close();
   }
-#endif
   ShowSingletonTabOverwritingNTP(
       GetSingletonTabNavigateParams(GURL(chrome::kChromeUIDownloadsURL)));
 }
 
 void Browser::ShowExtensionsTab() {
   content::RecordAction(UserMetricsAction("ShowExtensions"));
   browser::NavigateParams params(
       GetSingletonTabNavigateParams(GURL(chrome::kChromeUIExtensionsURL)));
   params.path_behavior = browser::NavigateParams::IGNORE_AND_NAVIGATE;
   ShowSingletonTabOverwritingNTP(params);
@@ skipping 157 matching lines @@
     window_->Activate();
   }
 }
 
 void Browser::OpenAddBluetoothDeviceDialog() {
   content::RecordAction(UserMetricsAction("OpenAddBluetoothDeviceDialog"));
   ShowOptionsTab(chrome::kBluetoothAddDeviceSubPage);
 }
 #endif  // defined(OS_CHROMEOS)
 
-#if defined(OS_CHROMEOS) && defined(USE_AURA)
+#if defined(OS_CHROMEOS)
 void Browser::OpenCrosh() {
   GURL crosh_url = TerminalExtensionHelper::GetCroshExtensionURL(profile_);
   if (!crosh_url.is_valid())
     return;
   OpenURL(OpenURLParams(crosh_url, Referrer(), NEW_FOREGROUND_TAB,
           content::PAGE_TRANSITION_GENERATED,
           false));
 }
 #endif
 
@@ skipping 651 matching lines @@
     case IDC_UPGRADE_DIALOG:        OpenUpdateChromeDialog();         break;
     case IDC_VIEW_INCOMPATIBILITIES: ShowAboutConflictsTab();         break;
     case IDC_HELP_PAGE:             ShowHelpTab();                    break;
 #if defined(OS_CHROMEOS)
     case IDC_LOCK_SCREEN:           LockScreen();                     break;
     case IDC_SHUTDOWN:              Shutdown();                       break;
     case IDC_FILE_MANAGER:          OpenFileManager();                break;
     case IDC_INTERNET_OPTIONS:      OpenInternetOptionsDialog();      break;
     case IDC_LANGUAGE_OPTIONS:      OpenLanguageOptionsDialog();      break;
 #endif
-#if defined(OS_CHROMEOS) && defined(USE_AURA)
+#if defined(OS_CHROMEOS)
     case IDC_NEW_CROSH_TAB:         OpenCrosh();                    break;
 #endif
     case IDC_SHOW_SYNC_SETUP:       ShowSyncSetup(SyncPromoUI::SOURCE_MENU);
                                     break;
     case IDC_TOGGLE_SPEECH_INPUT:   ToggleSpeechInput();              break;
 
     default:
       LOG(WARNING) << "Received Unimplemented Command: " << id;
       break;
   }
@@ skipping 718 matching lines @@
     // 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()) {
-#if defined(OS_CHROMEOS) && !defined(USE_AURA)
-    if (ActiveDownloadsUI::ShouldShowPopup(profile_, download))
-      ActiveDownloadsUI::OpenPopup(profile_);
-#else
     // 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()->GetSelectedWebContents();
     if ((download->GetTotalBytes() > 0) &&
         !ChromeDownloadManagerDelegate::IsExtensionDownload(download) &&
         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->GetController().IsInitialNavigation() && tab_count() > 1)
     CloseContents(source);
 }
 
 void Browser::ShowPageInfo(content::WebContents* web_contents,
                            const GURL& url,
                            const SSLStatus& ssl,
@@ skipping 654 matching lines @@
   // (like Back & Forward with initial page load) must have their state
   // initialized here, otherwise they will be forever disabled.
 
   // Navigation commands
   command_updater_.UpdateCommandEnabled(IDC_RELOAD, true);
   command_updater_.UpdateCommandEnabled(IDC_RELOAD_IGNORING_CACHE, true);
 
   // Window management commands
   command_updater_.UpdateCommandEnabled(IDC_CLOSE_WINDOW, true);
   command_updater_.UpdateCommandEnabled(IDC_NEW_TAB, true);
-#if defined(OS_CHROMEOS) && defined(USE_AURA)
+#if defined(OS_CHROMEOS)
   command_updater_.UpdateCommandEnabled(IDC_NEW_CROSH_TAB, true);
 #endif
   command_updater_.UpdateCommandEnabled(IDC_CLOSE_TAB, true);
   command_updater_.UpdateCommandEnabled(IDC_DUPLICATE_TAB, true);
   command_updater_.UpdateCommandEnabled(IDC_RESTORE_TAB, false);
   command_updater_.UpdateCommandEnabled(IDC_EXIT, true);
   command_updater_.UpdateCommandEnabled(IDC_DEBUG_FRAME_TOGGLE, true);
 
   // Page-related commands
   command_updater_.UpdateCommandEnabled(IDC_EMAIL_PAGE_LOCATION, true);
@@ skipping 985 matching lines @@
     ShowSingletonTabOverwritingNTP(params);
   } else {
     LoginUIServiceFactory::GetForProfile(
         profile()->GetOriginalProfile())->ShowLoginUI(false);
   }
 }
 
 void Browser::ToggleSpeechInput() {
   GetSelectedWebContents()->GetRenderViewHost()->ToggleSpeechInput();
 }