Get rid of a few more interfaces from RenderViewHostDelegate that aren't need...

chrome/browser/download/save_package.h

 // Copyright (c) 2010 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_DOWNLOAD_SAVE_PACKAGE_H_
 #define CHROME_BROWSER_DOWNLOAD_SAVE_PACKAGE_H_
 #pragma once
 
 #include <queue>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/hash_tables.h"
 #include "base/ref_counted.h"
 #include "base/task.h"
-#include "chrome/browser/renderer_host/render_view_host_delegate.h"
 #include "chrome/browser/shell_dialogs.h"
+#include "chrome/browser/tab_contents/web_navigation_observer.h"
 #include "googleurl/src/gurl.h"
 
 class SaveFileManager;
 class SaveItem;
 class SavePackage;
 class DownloadItem;
 class DownloadManager;
 class GURL;
 class MessageLoop;
 class PrefService;
@@ skipping 16 matching lines @@
 // file regardless internal sub resources and sub frames.
 // Saving page as complete-html page means we save not only the main html file
 // the user told it to save but also a directory for the auxiliary files such
 // as all sub-frame html files, image files, css files and js files.
 //
 // Each page saving job may include one or multiple files which need to be
 // saved. Each file is represented by a SaveItem, and all SaveItems are owned
 // by the SavePackage. SaveItems are created when a user initiates a page
 // saving job, and exist for the duration of one tab's life time.
 class SavePackage : public base::RefCountedThreadSafe<SavePackage>,
-                    public RenderViewHostDelegate::Save,
+                    public WebNavigationObserver,
                     public SelectFileDialog::Listener {
  public:
   enum SavePackageType {
     // The value of the save type before its set by the user.
     SAVE_TYPE_UNKNOWN = -1,
     // User chose to save only the HTML of the page.
     SAVE_AS_ONLY_HTML = 0,
     // User chose to save complete-html page.
     SAVE_AS_COMPLETE_HTML = 1
   };
@@ skipping 53 matching lines @@
   void ShowDownloadInShell();
 
   bool canceled() const { return user_canceled_ || disk_error_occurred_; }
   bool finished() const { return finished_; }
   SavePackageType save_type() const { return save_type_; }
   int tab_id() const { return tab_id_; }
   int id() const { return unique_id_; }
 
   void GetSaveInfo();
 
-  // RenderViewHostDelegate::Save ----------------------------------------------
-
-  // Process all of the current page's savable links of subresources, resources
-  // referrers and frames (including the main frame and subframes) from the
-  // render view host.
-  virtual void OnReceivedSavableResourceLinksForCurrentPage(
-      const std::vector<GURL>& resources_list,
-      const std::vector<GURL>& referrers_list,
-      const std::vector<GURL>& frames_list);
-
-  // Process the serialized html content data of a specified web page
-  // gotten from render process.
-  virtual void OnReceivedSerializedHtmlData(const GURL& frame_url,
-                                            const std::string& data,
-                                            int32 status);
-
   // Statics -------------------------------------------------------------------
 
   // Used to disable prompting the user for a directory/filename of the saved
   // web page.  This is available for testing.
   static void SetShouldPromptUser(bool should_prompt);
 
   // Check whether we can do the saving page operation for the specified URL.
   static bool IsSavableURL(const GURL& url);
 
   // Check whether we can do the saving page operation for the contents which
@@ skipping 15 matching lines @@
   ~SavePackage();
 
   // Notes from Init() above applies here as well.
   void InternalInit();
 
   void Stop();
   void CheckFinish();
   void SaveNextFile(bool process_all_remainder_items);
   void DoSavingProcess();
 
+  // WebNavigationObserver implementation.
+  virtual bool OnMessageReceived(const IPC::Message& message);
+
   // Create a file name based on the response from the server.
   bool GenerateFileName(const std::string& disposition,
                         const GURL& url,
                         bool need_html_ext,
                         FilePath::StringType* generated_name);
 
   // Get all savable resource links from current web page, include main
   // frame and sub-frame.
   void GetAllSavableResourceLinksForCurrentPage();
   // Get html data by serializing all frames of current page with lists
   // which contain all resource links that have local copy.
   void GetSerializedHtmlDataForCurrentPageWithLocalLinks();
 
   SaveItem* LookupItemInProcessBySaveId(int32 save_id);
   void PutInProgressItemToSavedMap(SaveItem* save_item);
 
   // Retrieves the URL to be saved from tab_contents_ variable.
   GURL GetUrlToBeSaved();
 
   void CreateDirectoryOnFileThread(const FilePath& website_save_dir,
                                    const FilePath& download_save_dir,
                                    const std::string& mime_type);
   void ContinueGetSaveInfo(const FilePath& suggested_path,
                            bool can_save_as_complete);
   void ContinueSave(const FilePath& final_name, int index);
 
+  void OnReceivedSavableResourceLinksForCurrentPage(
+      const std::vector<GURL>& resources_list,
+      const std::vector<GURL>& referrers_list,
+      const std::vector<GURL>& frames_list);
+
+  void OnReceivedSerializedHtmlData(const GURL& frame_url,
+                                    const std::string& data,
+                                    int32 status);
+
 
   typedef base::hash_map<std::string, SaveItem*> SaveUrlItemMap;
   // in_progress_items_ is map of all saving job in in-progress state.
   SaveUrlItemMap in_progress_items_;
   // saved_failed_items_ is map of all saving job which are failed.
   SaveUrlItemMap saved_failed_items_;
 
   // The number of in process SaveItems.
   int in_process_count() const {
     return static_cast<int>(in_progress_items_.size());
@@ skipping 97 matching lines @@
 
   friend class SavePackageTest;
   FRIEND_TEST_ALL_PREFIXES(SavePackageTest, TestSuggestedSaveNames);
 
   ScopedRunnableMethodFactory<SavePackage> method_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SavePackage);
 };
 
 #endif  // CHROME_BROWSER_DOWNLOAD_SAVE_PACKAGE_H_