Move download stuff from download helper back to TabContents. This is basically a revert of r8576...

chrome/browser/external_tab_container_win.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTERNAL_TAB_CONTAINER_WIN_H_
 #define CHROME_BROWSER_EXTERNAL_TAB_CONTAINER_WIN_H_
 #pragma once
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/automation/automation_resource_message_filter.h"
 #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"
 #include "content/browser/tab_contents/tab_contents_observer.h"
 #include "content/common/navigation_types.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
 #include "views/accelerator.h"
 #include "views/widget/native_widget_win.h"
 
 class AutomationProvider;
 class Browser;
 class Profile;
 class TabContentsContainer;
 class TabContentsWrapper;
 class RenderViewContextMenuViews;
 struct NavigationInfo;
 
 namespace ui {
 class ViewProp;
 }
 
 // This class serves as the container window for an external tab.
 // An external tab is a Chrome tab that is meant to displayed in an
 // external process. This class provides the FocusManger needed by the
 // 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>,
                              public views::AcceleratorTarget,
                              public InfoBarContainer::Delegate,
                              public BrowserBubbleHost,
                              public BlockedContentTabHelperDelegate {
  public:
   typedef std::map<uintptr_t, scoped_refptr<ExternalTabContainer> > PendingTabs;
 
@@ skipping 69 matching lines @@
                               TabContents* new_contents,
                               WindowOpenDisposition disposition,
                               const gfx::Rect& initial_pos,
                               bool user_gesture);
   virtual void CloseContents(TabContents* source);
   virtual void MoveContents(TabContents* source, const gfx::Rect& pos);
   virtual bool IsPopup(const TabContents* source) const;
   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(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.

[Randy Smith (Not in Mondays), 2011/07/15 15:55:12]

Why eliminate the comments?

[jam, 2011/07/15 17:28:14]

this is duplicating the TabContentsDelegate comments. usual style is to only
have the comments on the interface, and not implementors

   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);
 
   // Message handlers
   void OnForwardMessageToExternalHost(const std::string& message,
                                       const std::string& origin,
                                       const std::string& target);
 
   // Overridden from NotificationObserver:
   virtual void Observe(int type,
                        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.
   static scoped_refptr<ExternalTabContainer> RemovePendingTab(uintptr_t cookie);
 
   // Handles the specified |accelerator| being pressed.
   bool AcceleratorPressed(const views::Accelerator& accelerator);
 
   bool pending() const {
     return pending_;
@@ skipping 201 matching lines @@
     return false;
   }
 
   virtual void BeforeUnloadFired(TabContents* tab, bool proceed,
                                  bool* proceed_to_fire_unload) {
     NOTREACHED();
   }
 };
 
 #endif  // CHROME_BROWSER_EXTERNAL_TAB_CONTAINER_WIN_H_