Move the Save Page code to the browser/download/ directory.

Review URL: http://codereview.chromium.org/3040

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

19 files changed, 93 insertions, 89 deletions

diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc
index 189afee..999ca75 100644
--- a/chrome/browser/automation/automation_provider.cc
+++ b/chrome/browser/automation/automation_provider.cc
@@ -14,13 +14,13 @@
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/dom_operation_notification_details.h"
 #include "chrome/browser/download/download_manager.h"
+#include "chrome/browser/download/save_package.h"
 #include "chrome/browser/external_tab_container.h"
 #include "chrome/browser/find_notification_details.h"
 #include "chrome/browser/login_prompt.h"
 #include "chrome/browser/navigation_entry.h"
 #include "chrome/browser/printing/print_job.h"
 #include "chrome/browser/render_view_host.h"
-#include "chrome/browser/save_package.h"
 #include "chrome/browser/ssl_blocking_page.h"
 #include "chrome/browser/web_contents.h"
 #include "chrome/browser/views/bookmark_bar_view.h"
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index edca8df..b01c2ce 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -20,13 +20,13 @@
 #include "chrome/browser/cert_store.h"
 #include "chrome/browser/debugger/debugger_window.h"
 #include "chrome/browser/dom_ui/new_tab_ui.h"
+#include "chrome/browser/download/save_package.h"
 #include "chrome/browser/frame_util.h"
 #include "chrome/browser/navigation_controller.h"
 #include "chrome/browser/navigation_entry.h"
 #include "chrome/browser/plugin_process_host.h"
 #include "chrome/browser/plugin_service.h"
 #include "chrome/browser/profile.h"
-#include "chrome/browser/save_package.h"
 #include "chrome/browser/ssl_error_info.h"
 #include "chrome/browser/site_instance.h"
 #include "chrome/browser/url_fixer_upper.h"
diff --git a/chrome/browser/browser.vcproj b/chrome/browser/browser.vcproj
index 31ce6d6..004701f 100644
--- a/chrome/browser/browser.vcproj
+++ b/chrome/browser/browser.vcproj
@@ -562,50 +562,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\save_file.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\save_file.h"
-				>
-			</File>
-			<File
-				RelativePath=".\save_file_manager.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\save_file_manager.h"
-				>
-			</File>
-			<File
-				RelativePath=".\save_item.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\save_item.h"
-				>
-			</File>
-			<File
-				RelativePath=".\save_package.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\save_package.h"
-				>
-			</File>
-			<File
-				RelativePath=".\save_page_model.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\save_page_model.h"
-				>
-			</File>
-			<File
-				RelativePath=".\save_types.h"
-				>
-			</File>
-			<File
 				RelativePath=".\session_crashed_view.cc"
 				>
 			</File>
@@ -2026,6 +1982,54 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Save Page"
+			>
+			<File
+				RelativePath=".\download\save_file.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\download\save_file.h"
+				>
+			</File>
+			<File
+				RelativePath=".\download\save_file_manager.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\download\save_file_manager.h"
+				>
+			</File>
+			<File
+				RelativePath=".\download\save_item.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\download\save_item.h"
+				>
+			</File>
+			<File
+				RelativePath=".\download\save_package.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\download\save_package.h"
+				>
+			</File>
+			<File
+				RelativePath=".\download\save_page_model.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\download\save_page_model.h"
+				>
+			</File>
+			<File
+				RelativePath=".\download\save_types.h"
+				>
+			</File>
+		</Filter>
 		<File
 			RelativePath=".\cert_store.cc"
 			>
diff --git a/chrome/browser/save_file.cc b/chrome/browser/download/save_file.cc
index 09dc825..b92edf2 100644
--- a/chrome/browser/save_file.cc
+++ b/chrome/browser/download/save_file.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/save_file.h"
+#include "chrome/browser/download/save_file.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
-#include "chrome/browser/save_types.h"
+#include "chrome/browser/download/save_types.h"
 #include "chrome/common/win_util.h"
 #include "chrome/common/win_safe_util.h"
 
diff --git a/chrome/browser/save_file.h b/chrome/browser/download/save_file.h
index 0760eb0..3d5e06c 100644
--- a/chrome/browser/save_file.h
+++ b/chrome/browser/download/save_file.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SAVE_FILE_H__
-#define CHROME_BROWSER_SAVE_FILE_H__
+#ifndef CHROME_BROWSER_DOWNLOAD_SAVE_FILE_H__
+#define CHROME_BROWSER_DOWNLOAD_SAVE_FILE_H__
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
-#include "chrome/browser/save_types.h"
+#include "chrome/browser/download/save_types.h"
 
 // SaveFile ----------------------------------------------------------------
 
@@ -76,5 +76,5 @@ class SaveFile {
   DISALLOW_EVIL_CONSTRUCTORS(SaveFile);
 };
 
-#endif  // CHROME_BROWSER_SAVE_FILE_H__
+#endif  // CHROME_BROWSER_DOWNLOAD_SAVE_FILE_H__
 
diff --git a/chrome/browser/save_file_manager.cc b/chrome/browser/download/save_file_manager.cc
index e8537a7..2a909b72 100644
--- a/chrome/browser/save_file_manager.cc
+++ b/chrome/browser/download/save_file_manager.cc
@@ -5,7 +5,7 @@
 #include <Windows.h>
 #include <objbase.h>
 
-#include "chrome/browser/save_file_manager.h"
+#include "chrome/browser/download/save_file_manager.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
@@ -13,9 +13,9 @@
 #include "base/string_util.h"
 #include "base/task.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/download/save_file.h"
+#include "chrome/browser/download/save_package.h"
 #include "chrome/browser/resource_dispatcher_host.h"
-#include "chrome/browser/save_file.h"
-#include "chrome/browser/save_package.h"
 #include "chrome/browser/tab_contents.h"
 #include "chrome/browser/tab_util.h"
 #include "chrome/browser/web_contents.h"
diff --git a/chrome/browser/save_file_manager.h b/chrome/browser/download/save_file_manager.h
index 19630dc..8bd6e89 100644
--- a/chrome/browser/save_file_manager.h
+++ b/chrome/browser/download/save_file_manager.h
@@ -55,8 +55,8 @@
 // during saving, the SavePackage will notice the SaveFileManage to
 // cancel all SaveFile job.
 
-#ifndef CHROME_BROWSER_SAVE_FILE_MANAGER_H__
-#define CHROME_BROWSER_SAVE_FILE_MANAGER_H__
+#ifndef CHROME_BROWSER_DOWNLOAD_SAVE_FILE_MANAGER_H__
+#define CHROME_BROWSER_DOWNLOAD_SAVE_FILE_MANAGER_H__
 
 #include <utility>
 
@@ -64,7 +64,7 @@
 #include "base/hash_tables.h"
 #include "base/ref_counted.h"
 #include "base/thread.h"
-#include "chrome/browser/save_types.h"
+#include "chrome/browser/download/save_types.h"
 
 class GURL;
 class SaveFile;
@@ -259,4 +259,4 @@ class SaveFileManager
   DISALLOW_EVIL_CONSTRUCTORS(SaveFileManager);
 };
 
-#endif  // CHROME_BROWSER_SAVE_FILE_MANAGER_H__
+#endif  // CHROME_BROWSER_DOWNLOAD_SAVE_FILE_MANAGER_H__
diff --git a/chrome/browser/save_item.cc b/chrome/browser/download/save_item.cc
index 1766526..b7b7ee40 100644
--- a/chrome/browser/save_item.cc
+++ b/chrome/browser/download/save_item.cc
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/save_item.h"
+#include "chrome/browser/download/save_item.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/win_util.h"
-#include "chrome/browser/save_file.h"
-#include "chrome/browser/save_file_manager.h"
-#include "chrome/browser/save_package.h"
+#include "chrome/browser/download/save_file.h"
+#include "chrome/browser/download/save_file_manager.h"
+#include "chrome/browser/download/save_package.h"
 
 // Constructor for SaveItem when creating each saving job.
 SaveItem::SaveItem(const std::wstring& url,
diff --git a/chrome/browser/save_item.h b/chrome/browser/download/save_item.h
index f8035a8..3c3ed4a 100644
--- a/chrome/browser/save_item.h
+++ b/chrome/browser/download/save_item.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-#ifndef CHROME_BROWSER_SAVE_ITEM_H__
-#define CHROME_BROWSER_SAVE_ITEM_H__
+#ifndef CHROME_BROWSER_DOWNLOAD_SAVE_ITEM_H__
+#define CHROME_BROWSER_DOWNLOAD_SAVE_ITEM_H__
 
 #include <string>
 
 #include "base/basictypes.h"
-#include "chrome/browser/save_types.h"
+#include "chrome/browser/download/save_types.h"
 
 class SavePackage;
 
@@ -108,5 +108,5 @@ class SaveItem {
   DISALLOW_EVIL_CONSTRUCTORS(SaveItem);
 };
 
-#endif  // CHROME_BROWSER_SAVE_ITEM_H__
+#endif  // CHROME_BROWSER_DOWNLOAD_SAVE_ITEM_H__
 
diff --git a/chrome/browser/save_package.cc b/chrome/browser/download/save_package.cc
index e1dab67..5410d31 100644
--- a/chrome/browser/save_package.cc
+++ b/chrome/browser/download/save_package.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/save_package.h"
+#include "chrome/browser/download/save_package.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
@@ -14,14 +14,14 @@
 #include "base/win_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_manager.h"
+#include "chrome/browser/download/save_file.h"
+#include "chrome/browser/download/save_file_manager.h"
+#include "chrome/browser/download/save_page_model.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/render_process_host.h"
 #include "chrome/browser/render_view_host.h"
 #include "chrome/browser/render_view_host_delegate.h"
 #include "chrome/browser/resource_dispatcher_host.h"
-#include "chrome/browser/save_file.h"
-#include "chrome/browser/save_file_manager.h"
-#include "chrome/browser/save_page_model.h"
 #include "chrome/browser/tab_util.h"
 #include "chrome/browser/web_contents.h"
 #include "chrome/browser/views/download_shelf_view.h"
diff --git a/chrome/browser/save_package.h b/chrome/browser/download/save_package.h
index 07deb91..8c12190 100644
--- a/chrome/browser/save_package.h
+++ b/chrome/browser/download/save_package.h
@@ -15,8 +15,8 @@
 // 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.
 
-#ifndef CHROME_BROWSER_SAVE_PACKAGE_H__
-#define CHROME_BROWSER_SAVE_PACKAGE_H__
+#ifndef CHROME_BROWSER_DOWNLOAD_SAVE_PACKAGE_H__
+#define CHROME_BROWSER_DOWNLOAD_SAVE_PACKAGE_H__
 
 #include <string>
 #include <vector>
@@ -28,8 +28,8 @@
 #include "base/ref_counted.h"
 #include "base/time.h"
 #include "chrome/common/pref_member.h"
-#include "chrome/browser/save_item.h"
-#include "chrome/browser/save_types.h"
+#include "chrome/browser/download/save_item.h"
+#include "chrome/browser/download/save_types.h"
 
 class SaveFileManager;
 class SavePackage;
@@ -306,4 +306,4 @@ class SavePackage : public base::RefCountedThreadSafe<SavePackage> {
   DISALLOW_EVIL_CONSTRUCTORS(SavePackage);
 };
 
-#endif  // CHROME_BROWSER_SAVE_PACKAGE_H__
+#endif  // CHROME_BROWSER_DOWNLOAD_SAVE_PACKAGE_H__
diff --git a/chrome/browser/save_package_unittest.cc b/chrome/browser/download/save_package_unittest.cc
index 81ee4e3..1889653 100644
--- a/chrome/browser/save_package_unittest.cc
+++ b/chrome/browser/download/save_package_unittest.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/logging.h"
-#include "chrome/browser/save_package.h"
+#include "chrome/browser/download/save_package.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 //    0         1         2         3         4         5         6
diff --git a/chrome/browser/save_page_model.cc b/chrome/browser/download/save_page_model.cc
index 774d59a..1a78e24 100644
--- a/chrome/browser/save_page_model.cc
+++ b/chrome/browser/download/save_page_model.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/save_page_model.h"
+#include "chrome/browser/download/save_page_model.h"
 
 #include "base/string_util.h"
 #include "chrome/browser/download/download_manager.h"
-#include "chrome/browser/save_package.h"
+#include "chrome/browser/download/save_package.h"
 #include "chrome/common/l10n_util.h"
 
 #include "generated_resources.h"
diff --git a/chrome/browser/save_page_model.h b/chrome/browser/download/save_page_model.h
index ce373b3..75a4497 100644
--- a/chrome/browser/save_page_model.h
+++ b/chrome/browser/download/save_page_model.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SAVE_PAGE_MODEL_H__
-#define CHROME_BROWSER_SAVE_PAGE_MODEL_H__
+#ifndef CHROME_BROWSER_DOWNLOAD_SAVE_PAGE_MODEL_H__
+#define CHROME_BROWSER_DOWNLOAD_SAVE_PAGE_MODEL_H__
 
 #include "chrome/browser/views/download_item_view.h"
 
@@ -34,5 +34,5 @@ class SavePageModel : public DownloadItemView::BaseDownloadItemModel {
   DISALLOW_EVIL_CONSTRUCTORS(SavePageModel);
 };
 
-#endif  // CHROME_BROWSER_SAVE_PAGE_MODEL_H__
+#endif  // CHROME_BROWSER_DOWNLOAD_SAVE_PAGE_MODEL_H__
 
diff --git a/chrome/browser/save_page_uitest.cc b/chrome/browser/download/save_page_uitest.cc
index 3883091..4e9fca6 100644
--- a/chrome/browser/save_page_uitest.cc
+++ b/chrome/browser/download/save_page_uitest.cc
@@ -6,7 +6,7 @@
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "chrome/browser/automation/url_request_mock_http_job.h"
-#include "chrome/browser/save_package.h"
+#include "chrome/browser/download/save_package.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/ui/ui_test.h"
diff --git a/chrome/browser/save_types.h b/chrome/browser/download/save_types.h
index e9d19e3..1a8832c 100644
--- a/chrome/browser/save_types.h
+++ b/chrome/browser/download/save_types.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SAVE_TYPES_H__
-#define CHROME_BROWSER_SAVE_TYPES_H__
+#ifndef CHROME_BROWSER_DOWNLOAD_SAVE_TYPES_H__
+#define CHROME_BROWSER_DOWNLOAD_SAVE_TYPES_H__
 
 #include <vector>
 #include <utility>
@@ -67,5 +67,5 @@ struct SaveFileCreateInfo {
   SaveFileSource save_source;
 };
 
-#endif  // CHROME_BROWSER_SAVE_TYPES_H__
+#endif  // CHROME_BROWSER_DOWNLOAD_SAVE_TYPES_H__
 
diff --git a/chrome/browser/render_view_context_menu_controller.cc b/chrome/browser/render_view_context_menu_controller.cc
index eb688a9..8ea251e 100644
--- a/chrome/browser/render_view_context_menu_controller.cc
+++ b/chrome/browser/render_view_context_menu_controller.cc
@@ -13,10 +13,10 @@
 #include "chrome/common/pref_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_manager.h"
+#include "chrome/browser/download/save_package.h"
 #include "chrome/browser/navigation_controller.h"
 #include "chrome/browser/navigation_entry.h"
 #include "chrome/browser/profile.h"
-#include "chrome/browser/save_package.h"
 #include "chrome/browser/template_url_model.h"
 #include "chrome/browser/web_contents.h"
 #include "chrome/common/chrome_switches.h"
diff --git a/chrome/browser/resource_dispatcher_host.cc b/chrome/browser/resource_dispatcher_host.cc
index b2e78b6..e6035f8 100644
--- a/chrome/browser/resource_dispatcher_host.cc
+++ b/chrome/browser/resource_dispatcher_host.cc
@@ -15,6 +15,7 @@
 #include "chrome/browser/cross_site_request_manager.h"
 #include "chrome/browser/download/download_file.h"
 #include "chrome/browser/download/download_manager.h"
+#include "chrome/browser/download/save_file_manager.h"
 #include "chrome/browser/external_protocol_handler.h"
 #include "chrome/browser/login_prompt.h"
 #include "chrome/browser/plugin_service.h"
@@ -23,7 +24,6 @@
 #include "chrome/browser/render_view_host_delegate.h"
 #include "chrome/browser/resource_request_details.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
-#include "chrome/browser/save_file_manager.h"
 #include "chrome/browser/tab_contents.h"
 #include "chrome/browser/tab_util.h"
 #include "chrome/browser/views/info_bar_view.h"
diff --git a/chrome/browser/web_contents.h b/chrome/browser/web_contents.h
index fd12b9b..cc6c11c 100644
--- a/chrome/browser/web_contents.h
+++ b/chrome/browser/web_contents.h
@@ -6,11 +6,11 @@
 #define CHROME_BROWSER_WEB_CONTENTS_H_
 
 #include "base/hash_tables.h"
+#include "chrome/browser/download/save_package.h"
 #include "chrome/browser/fav_icon_helper.h"
 #include "chrome/browser/printing/print_view_manager.h"
 #include "chrome/browser/render_view_host_delegate.h"
 #include "chrome/browser/render_view_host_manager.h"
-#include "chrome/browser/save_package.h"
 #include "chrome/browser/shell_dialogs.h"
 #include "chrome/browser/tab_contents.h"
 #include "chrome/browser/web_app.h"