Move download stuff from download helper back to TabContents. This is basically a revert of r85762, with updating for code changes in the meantime.

BUG=82782
Review URL: http://codereview.chromium.org/7374008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92747 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 24 deletions

diff --git a/chrome/browser/external_tab_container_win.h b/chrome/browser/external_tab_container_win.h
index a9a9d57..a53f023 100644
--- a/chrome/browser/external_tab_container_win.h
+++ b/chrome/browser/external_tab_container_win.h
@@ -16,7 +16,6 @@
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/tab_contents/infobar_container.h"
 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper_delegate.h"
-#include "chrome/browser/ui/download/download_tab_helper_delegate.h"
 #include "chrome/browser/ui/views/frame/browser_bubble_host.h"
 #include "chrome/browser/ui/views/unhandled_keyboard_event_handler.h"
 #include "content/browser/tab_contents/tab_contents_delegate.h"
@@ -45,7 +44,6 @@ class ViewProp;
 // TabContents as well as an implementation of TabContentsDelegate.
 class ExternalTabContainer : public TabContentsDelegate,
                              public TabContentsObserver,
-                             public DownloadTabHelperDelegate,
                              public NotificationObserver,
                              public views::NativeWidgetWin,
                              public base::RefCounted<ExternalTabContainer>,
@@ -135,41 +133,26 @@ class ExternalTabContainer : public TabContentsDelegate,
   virtual void UpdateTargetURL(TabContents* source, const GURL& url);
   virtual void ContentsZoomChange(bool zoom_in);
   virtual gfx::NativeWindow GetFrameNativeWindow();
-
   virtual bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event,
                                       bool* is_keyboard_shortcut);
   virtual void HandleKeyboardEvent(const NativeWebKeyboardEvent& event);
-
   virtual bool TakeFocus(bool reverse);
-
+  virtual bool CanDownload(TabContents* source, int request_id);
   virtual bool OnGoToEntryOffset(int offset);
-
   virtual void ShowPageInfo(Profile* profile,
                             const GURL& url,
                             const NavigationEntry::SSLStatus& ssl,
                             bool show_history);
-
-  // Handles the context menu display operation. This allows external
-  // hosts to customize the menu.
   virtual bool HandleContextMenu(const ContextMenuParams& params);
-
-  // Executes the context menu command identified by the command
-  // parameter.
   virtual bool ExecuteContextMenuCommand(int command);
-
   virtual void BeforeUnloadFired(TabContents* tab,
                                  bool proceed,
                                  bool* proceed_to_fire_unload);
-
-  virtual content::JavaScriptDialogCreator* GetJavaScriptDialogCreator()
-      OVERRIDE;
-
+  virtual content::JavaScriptDialogCreator* GetJavaScriptDialogCreator();
   void ShowRepostFormWarningDialog(TabContents* tab_contents);
-
   void RegisterRenderViewHost(RenderViewHost* render_view_host);
   void UnregisterRenderViewHost(RenderViewHost* render_view_host);
 
-
   // Overridden from TabContentsObserver:
   // IPC::Channel::Listener implementation.
   virtual bool OnMessageReceived(const IPC::Message& message);
@@ -184,11 +167,6 @@ class ExternalTabContainer : public TabContentsDelegate,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
-  // Overridden from DownloadTabHelperDelegate:
-  virtual bool CanDownload(int request_id) OVERRIDE;
-  virtual void OnStartDownload(DownloadItem* download,
-                               TabContentsWrapper* tab) OVERRIDE;
-
   // Returns the ExternalTabContainer instance associated with the cookie
   // passed in. It also erases the corresponding reference from the map.
   // Returns NULL if we fail to find the cookie in the map.