diff options
35 files changed, 96 insertions, 94 deletions
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index a9ae6a8b..189afee 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -13,7 +13,7 @@ #include "chrome/browser/automation/url_request_slow_download_job.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/dom_operation_notification_details.h" -#include "chrome/browser/download_manager.h" +#include "chrome/browser/download/download_manager.h" #include "chrome/browser/external_tab_container.h" #include "chrome/browser/find_notification_details.h" #include "chrome/browser/login_prompt.h" diff --git a/chrome/browser/browser.vcproj b/chrome/browser/browser.vcproj index 5ab27dd..b0511f1 100644 --- a/chrome/browser/browser.vcproj +++ b/chrome/browser/browser.vcproj @@ -330,42 +330,6 @@ > </File> <File - RelativePath=".\download_exe.cc" - > - </File> - <File - RelativePath=".\download_file.cc" - > - </File> - <File - RelativePath=".\download_file.h" - > - </File> - <File - RelativePath=".\download_item_model.cc" - > - </File> - <File - RelativePath=".\download_item_model.h" - > - </File> - <File - RelativePath=".\download_manager.cc" - > - </File> - <File - RelativePath=".\download_manager.h" - > - </File> - <File - RelativePath=".\download_util.cc" - > - </File> - <File - RelativePath=".\download_util.h" - > - </File> - <File RelativePath=".\fav_icon_helper.cc" > </File> @@ -1194,11 +1158,11 @@ > </File> <File - RelativePath=".\download_tab_view.cc" + RelativePath=".\views\download_tab_view.cc" > </File> <File - RelativePath=".\download_tab_view.h" + RelativePath=".\views\download_tab_view.h" > </File> <File @@ -2022,6 +1986,46 @@ > </File> </Filter> + <Filter + Name="Download" + > + <File + RelativePath=".\download\download_exe.cc" + > + </File> + <File + RelativePath=".\download\download_file.cc" + > + </File> + <File + RelativePath=".\download\download_file.h" + > + </File> + <File + RelativePath=".\download\download_item_model.cc" + > + </File> + <File + RelativePath=".\download\download_item_model.h" + > + </File> + <File + RelativePath=".\download\download_manager.cc" + > + </File> + <File + RelativePath=".\download\download_manager.h" + > + </File> + <File + RelativePath=".\download\download_util.cc" + > + </File> + <File + RelativePath=".\download\download_util.h" + > + </File> + </Filter> <File RelativePath=".\cert_store.cc" > diff --git a/chrome/browser/browser_commands.cc b/chrome/browser/browser_commands.cc index 363c6bd..d2cb3fe 100644 --- a/chrome/browser/browser_commands.cc +++ b/chrome/browser/browser_commands.cc @@ -16,7 +16,7 @@ #include "chrome/browser/browser_window.h" #include "chrome/browser/character_encoding.h" #include "chrome/browser/debugger/debugger_window.h" -#include "chrome/browser/download_tab_view.h" +#include "chrome/browser/views/download_tab_view.h" #include "chrome/browser/history_tab_ui.h" #include "chrome/browser/interstitial_page_delegate.h" #include "chrome/browser/navigation_entry.h" diff --git a/chrome/browser/browser_prefs.cc b/chrome/browser/browser_prefs.cc index 7f6c351..80f8571 100644 --- a/chrome/browser/browser_prefs.cc +++ b/chrome/browser/browser_prefs.cc @@ -8,7 +8,7 @@ #include "chrome/browser/browser_shutdown.h" #include "chrome/browser/cache_manager_host.h" #include "chrome/browser/net/dns_global.h" -#include "chrome/browser/download_manager.h" +#include "chrome/browser/download/download_manager.h" #include "chrome/browser/external_protocol_handler.h" #include "chrome/browser/google_url_tracker.h" #include "chrome/browser/metrics_service.h" diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index 5c218ca..cfe91ea 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -9,7 +9,7 @@ #include "base/path_service.h" #include "chrome/browser/automation/automation_provider_list.h" #include "chrome/browser/chrome_thread.h" -#include "chrome/browser/download_file.h" +#include "chrome/browser/download/download_file.h" #include "chrome/browser/google_url_tracker.h" #include "chrome/browser/icon_manager.h" #include "chrome/browser/metrics_service.h" diff --git a/chrome/browser/browsing_data_remover.cc b/chrome/browser/browsing_data_remover.cc index 25891c9..c38424a 100644 --- a/chrome/browser/browsing_data_remover.cc +++ b/chrome/browser/browsing_data_remover.cc @@ -6,7 +6,7 @@ #include "chrome/browser/chrome_thread.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/download_manager.h" +#include "chrome/browser/download/download_manager.h" #include "chrome/browser/profile.h" #include "chrome/browser/session_service.h" #include "chrome/browser/tab_restore_service.h" diff --git a/chrome/browser/download_exe.cc b/chrome/browser/download/download_exe.cc index 10518143..c9fdc4d 100644 --- a/chrome/browser/download_exe.cc +++ b/chrome/browser/download/download_exe.cc @@ -5,7 +5,7 @@ #include <set> #include <string> -#include "chrome/browser/download_util.h" +#include "chrome/browser/download/download_util.h" namespace download_util { diff --git a/chrome/browser/download_file.cc b/chrome/browser/download/download_file.cc index 8b1da8c..99f5caa 100644 --- a/chrome/browser/download_file.cc +++ b/chrome/browser/download/download_file.cc @@ -5,7 +5,7 @@ #include <Windows.h> #include <objbase.h> -#include "chrome/browser/download_file.h" +#include "chrome/browser/download/download_file.h" #include "base/file_util.h" #include "base/path_service.h" @@ -13,7 +13,7 @@ #include "base/string_util.h" #include "base/task.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/download_manager.h" +#include "chrome/browser/download/download_manager.h" #include "chrome/browser/profile.h" #include "chrome/browser/resource_dispatcher_host.h" #include "chrome/browser/tab_contents.h" diff --git a/chrome/browser/download_file.h b/chrome/browser/download/download_file.h index 2f9a55a..5a6158d 100644 --- a/chrome/browser/download_file.h +++ b/chrome/browser/download/download_file.h @@ -38,8 +38,8 @@ // appropriate DownloadManager. In progress downloads are cancelled for a // DownloadManager that exits (such as when closing a profile). -#ifndef CHROME_BROWSER_DOWNLOAD_FILE_H__ -#define CHROME_BROWSER_DOWNLOAD_FILE_H__ +#ifndef CHROME_BROWSER_DOWNLOAD_DOWNLOAD_FILE_H__ +#define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_FILE_H__ #include <string> #include <vector> @@ -270,4 +270,4 @@ class DownloadFileManager DISALLOW_EVIL_CONSTRUCTORS(DownloadFileManager); }; -#endif // CHROME_BROWSER_DOWNLOAD_FILE_H__ +#endif // CHROME_BROWSER_DOWNLOAD_DOWNLOAD_FILE_H__ diff --git a/chrome/browser/download_item_model.cc b/chrome/browser/download/download_item_model.cc index f6103d5..db93b35 100644 --- a/chrome/browser/download_item_model.cc +++ b/chrome/browser/download/download_item_model.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/download_item_model.h" +#include "chrome/browser/download/download_item_model.h" #include "base/string_util.h" -#include "chrome/browser/download_manager.h" +#include "chrome/browser/download/download_manager.h" #include "chrome/common/l10n_util.h" #include "chrome/common/time_format.h" diff --git a/chrome/browser/download_item_model.h b/chrome/browser/download/download_item_model.h index b0d384a..edeac1c 100644 --- a/chrome/browser/download_item_model.h +++ b/chrome/browser/download/download_item_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_DOWNLOAD_ITEM_MODEL_H__ -#define CHROME_BROWSER_DOWNLOAD_ITEM_MODEL_H__ +#ifndef CHROME_BROWSER_DOWNLOAD_DOWNLOAD_ITEM_MODEL_H__ +#define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_ITEM_MODEL_H__ #include "chrome/browser/views/download_item_view.h" @@ -30,5 +30,5 @@ class DownloadItemModel : public DownloadItemView::BaseDownloadItemModel { DISALLOW_EVIL_CONSTRUCTORS(DownloadItemModel); }; -#endif // CHROME_BROWSER_DOWNLOAD_ITEM_MODEL_H__ +#endif // CHROME_BROWSER_DOWNLOAD_DOWNLOAD_ITEM_MODEL_H__ diff --git a/chrome/browser/download_manager.cc b/chrome/browser/download/download_manager.cc index a587445..d83ddc2 100644 --- a/chrome/browser/download_manager.cc +++ b/chrome/browser/download/download_manager.cc @@ -4,7 +4,7 @@ #include <time.h> -#include "chrome/browser/download_manager.h" +#include "chrome/browser/download/download_manager.h" #include "base/file_util.h" #include "base/logging.h" @@ -18,8 +18,8 @@ #include "base/win_util.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/download_file.h" -#include "chrome/browser/download_util.h" +#include "chrome/browser/download/download_file.h" +#include "chrome/browser/download/download_util.h" #include "chrome/browser/profile.h" #include "chrome/browser/render_process_host.h" #include "chrome/browser/render_view_host.h" diff --git a/chrome/browser/download_manager.h b/chrome/browser/download/download_manager.h index 498383a..0ab3dc1 100644 --- a/chrome/browser/download_manager.h +++ b/chrome/browser/download/download_manager.h @@ -32,8 +32,8 @@ // DownloadManager is constructed, we query the history service for the state of // all persisted downloads. -#ifndef CHROME_BROWSER_DOWNLOAD_MANAGER_H__ -#define CHROME_BROWSER_DOWNLOAD_MANAGER_H__ +#ifndef CHROME_BROWSER_DOWNLOAD_DOWNLOAD_MANAGER_H__ +#define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_MANAGER_H__ #include <string> #include <map> @@ -480,4 +480,4 @@ class DownloadManager : public base::RefCountedThreadSafe<DownloadManager>, }; -#endif // CHROME_BROWSER_DOWNLOAD_MANAGER_H__ +#endif // CHROME_BROWSER_DOWNLOAD_DOWNLOAD_MANAGER_H__ diff --git a/chrome/browser/download_manager_unittest.cc b/chrome/browser/download/download_manager_unittest.cc index db509e0..abfc100 100644 --- a/chrome/browser/download_manager_unittest.cc +++ b/chrome/browser/download/download_manager_unittest.cc @@ -5,8 +5,8 @@ #include <string> #include "base/logging.h" -#include "chrome/browser/download_manager.h" -#include "chrome/browser/download_util.h" +#include "chrome/browser/download/download_manager.h" +#include "chrome/browser/download/download_util.h" #include "testing/gtest/include/gtest/gtest.h" class DownloadManagerTest : public testing::Test { diff --git a/chrome/browser/download_uitest.cc b/chrome/browser/download/download_uitest.cc index e6c071e..e6c071e 100644 --- a/chrome/browser/download_uitest.cc +++ b/chrome/browser/download/download_uitest.cc diff --git a/chrome/browser/download_util.cc b/chrome/browser/download/download_util.cc index c008ab9..530eade 100644 --- a/chrome/browser/download_util.cc +++ b/chrome/browser/download/download_util.cc @@ -6,14 +6,14 @@ #include <string> -#include "chrome/browser/download_util.h" +#include "chrome/browser/download/download_util.h" #include "base/base_drag_source.h" #include "base/file_util.h" #include "base/gfx/image_operations.h" #include "chrome/app/theme/theme_resources.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/download_manager.h" +#include "chrome/browser/download/download_manager.h" #include "chrome/common/clipboard_service.h" #include "chrome/browser/drag_utils.h" #include "chrome/common/gfx/chrome_canvas.h" diff --git a/chrome/browser/download_util.h b/chrome/browser/download/download_util.h index 6925b6e..0ad10ab 100644 --- a/chrome/browser/download_util.h +++ b/chrome/browser/download/download_util.h @@ -4,8 +4,8 @@ // // Download utilities. -#ifndef CHROME_BROWSER_DOWNLOAD_UTIL_H__ -#define CHROME_BROWSER_DOWNLOAD_UTIL_H__ +#ifndef CHROME_BROWSER_DOWNLOAD_DOWNLOAD_UTIL_H__ +#define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_UTIL_H__ #include <objidl.h> @@ -188,5 +188,5 @@ void InitializeExeTypes(std::set<std::wstring>* exe_extensions); } // namespace download_util -#endif // CHROME_BROWSER_DOWNLOAD_UTIL_H__ +#endif // CHROME_BROWSER_DOWNLOAD_DOWNLOAD_UTIL_H__ diff --git a/chrome/browser/history/download_database.cc b/chrome/browser/history/download_database.cc index 677499b..1baf976 100644 --- a/chrome/browser/history/download_database.cc +++ b/chrome/browser/history/download_database.cc @@ -7,7 +7,7 @@ #include "chrome/browser/history/download_database.h" -#include "chrome/browser/download_manager.h" +#include "chrome/browser/download/download_manager.h" #include "chrome/browser/history/download_types.h" #include "chrome/common/sqlite_utils.h" #include "chrome/common/sqlite_compiled_statement.h" diff --git a/chrome/browser/history/history_unittest.cc b/chrome/browser/history/history_unittest.cc index c2ec919..6e00e1b 100644 --- a/chrome/browser/history/history_unittest.cc +++ b/chrome/browser/history/history_unittest.cc @@ -27,7 +27,7 @@ #include "base/string_util.h" #include "base/task.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/download_manager.h" +#include "chrome/browser/download/download_manager.h" #include "chrome/browser/history/history.h" #include "chrome/browser/history/history_backend.h" #include "chrome/browser/history/history_database.h" diff --git a/chrome/browser/native_ui_contents.cc b/chrome/browser/native_ui_contents.cc index 73cd614..4c967a2 100644 --- a/chrome/browser/native_ui_contents.cc +++ b/chrome/browser/native_ui_contents.cc @@ -5,9 +5,9 @@ #include "chrome/browser/native_ui_contents.h" #include "chrome/browser/browser.h" -#include "chrome/browser/download_tab_view.h" #include "chrome/browser/history_tab_ui.h" #include "chrome/browser/navigation_entry.h" +#include "chrome/browser/views/download_tab_view.h" #include "chrome/common/drag_drop_types.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/chrome_font.h" diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc index 0ad41b6..3dd106f 100644 --- a/chrome/browser/profile.cc +++ b/chrome/browser/profile.cc @@ -14,7 +14,7 @@ #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/download_manager.h" +#include "chrome/browser/download/download_manager.h" #include "chrome/browser/history/history.h" #include "chrome/browser/navigation_controller.h" #include "chrome/browser/profile_manager.h" diff --git a/chrome/browser/render_view_context_menu_controller.cc b/chrome/browser/render_view_context_menu_controller.cc index 1a97ec3..eb688a9 100644 --- a/chrome/browser/render_view_context_menu_controller.cc +++ b/chrome/browser/render_view_context_menu_controller.cc @@ -12,7 +12,7 @@ #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/download_manager.h" +#include "chrome/browser/download/download_manager.h" #include "chrome/browser/navigation_controller.h" #include "chrome/browser/navigation_entry.h" #include "chrome/browser/profile.h" diff --git a/chrome/browser/resource_dispatcher_host.cc b/chrome/browser/resource_dispatcher_host.cc index e677027..b2e78b6 100644 --- a/chrome/browser/resource_dispatcher_host.cc +++ b/chrome/browser/resource_dispatcher_host.cc @@ -13,8 +13,8 @@ #include "base/time.h" #include "chrome/browser/cert_store.h" #include "chrome/browser/cross_site_request_manager.h" -#include "chrome/browser/download_file.h" -#include "chrome/browser/download_manager.h" +#include "chrome/browser/download/download_file.h" +#include "chrome/browser/download/download_manager.h" #include "chrome/browser/external_protocol_handler.h" #include "chrome/browser/login_prompt.h" #include "chrome/browser/plugin_service.h" diff --git a/chrome/browser/save_package.cc b/chrome/browser/save_package.cc index 8e22da6..e1dab67 100644 --- a/chrome/browser/save_package.cc +++ b/chrome/browser/save_package.cc @@ -13,7 +13,7 @@ #include "base/thread.h" #include "base/win_util.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/download_manager.h" +#include "chrome/browser/download/download_manager.h" #include "chrome/browser/profile.h" #include "chrome/browser/render_process_host.h" #include "chrome/browser/render_view_host.h" diff --git a/chrome/browser/save_page_model.cc b/chrome/browser/save_page_model.cc index dcda250..774d59a 100644 --- a/chrome/browser/save_page_model.cc +++ b/chrome/browser/save_page_model.cc @@ -5,7 +5,7 @@ #include "chrome/browser/save_page_model.h" #include "base/string_util.h" -#include "chrome/browser/download_manager.h" +#include "chrome/browser/download/download_manager.h" #include "chrome/browser/save_package.h" #include "chrome/common/l10n_util.h" diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc index 9c26e82..9de3d13 100644 --- a/chrome/browser/views/bookmark_bar_view.cc +++ b/chrome/browser/views/bookmark_bar_view.cc @@ -15,7 +15,7 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/drag_utils.h" -#include "chrome/browser/download_util.h" +#include "chrome/browser/download/download_util.h" #include "chrome/browser/history/history_backend.h" #include "chrome/browser/history/history_database.h" #include "chrome/browser/history/history.h" diff --git a/chrome/browser/views/download_item_view.cc b/chrome/browser/views/download_item_view.cc index 914a782..8ed9408 100644 --- a/chrome/browser/views/download_item_view.cc +++ b/chrome/browser/views/download_item_view.cc @@ -8,7 +8,7 @@ #include "chrome/app/theme/theme_resources.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/download_util.h" +#include "chrome/browser/download/download_util.h" #include "chrome/browser/views/download_shelf_view.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/resource_bundle.h" diff --git a/chrome/browser/views/download_item_view.h b/chrome/browser/views/download_item_view.h index ab42fd5..69adcc4 100644 --- a/chrome/browser/views/download_item_view.h +++ b/chrome/browser/views/download_item_view.h @@ -23,7 +23,7 @@ #include "base/timer.h" #include "chrome/common/slide_animation.h" #include "chrome/browser/cancelable_request.h" -#include "chrome/browser/download_manager.h" +#include "chrome/browser/download/download_manager.h" #include "chrome/browser/icon_manager.h" #include "chrome/views/event.h" #include "chrome/views/view.h" diff --git a/chrome/browser/views/download_shelf_view.cc b/chrome/browser/views/download_shelf_view.cc index 2ea2f4b..df6b7d5 100644 --- a/chrome/browser/views/download_shelf_view.cc +++ b/chrome/browser/views/download_shelf_view.cc @@ -8,12 +8,12 @@ #include "chrome/app/theme/theme_resources.h" #include "chrome/browser/browser.h" -#include "chrome/browser/download_item_model.h" -#include "chrome/browser/download_manager.h" -#include "chrome/browser/download_tab_view.h" +#include "chrome/browser/download/download_item_model.h" +#include "chrome/browser/download/download_manager.h" #include "chrome/browser/navigation_entry.h" #include "chrome/browser/tab_contents.h" #include "chrome/browser/views/download_item_view.h" +#include "chrome/browser/views/download_tab_view.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/l10n_util.h" #include "base/logging.h" diff --git a/chrome/browser/download_tab_view.cc b/chrome/browser/views/download_tab_view.cc index 8da5887..8c31275 100644 --- a/chrome/browser/download_tab_view.cc +++ b/chrome/browser/views/download_tab_view.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/download_tab_view.h" +#include "chrome/browser/views/download_tab_view.h" #include <time.h> @@ -16,8 +16,6 @@ #include "base/timer.h" #include "chrome/app/theme/theme_resources.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/download_manager.h" -#include "chrome/browser/download_util.h" #include "chrome/browser/profile.h" #include "chrome/browser/user_metrics.h" #include "chrome/common/gfx/chrome_canvas.h" diff --git a/chrome/browser/download_tab_view.h b/chrome/browser/views/download_tab_view.h index 29aff8f..5c1b2ec 100644 --- a/chrome/browser/download_tab_view.h +++ b/chrome/browser/views/download_tab_view.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_DONWLOAD_TAB_VIEW_H__ -#define CHROME_BROWSER_DONWLOAD_TAB_VIEW_H__ +#ifndef CHROME_BROWSER_VIEWS_DONWLOAD_TAB_VIEW_H__ +#define CHROME_BROWSER_VIEWS_DONWLOAD_TAB_VIEW_H__ #include "base/hash_tables.h" #include "chrome/browser/cancelable_request.h" -#include "chrome/browser/download_manager.h" -#include "chrome/browser/download_util.h" +#include "chrome/browser/download/download_manager.h" +#include "chrome/browser/download/download_util.h" #include "chrome/browser/icon_manager.h" #include "chrome/browser/native_ui_contents.h" #include "chrome/views/event.h" @@ -249,4 +249,4 @@ class DownloadTabUI : public NativeUI, DISALLOW_EVIL_CONSTRUCTORS(DownloadTabUI); }; -#endif // CHROME_BROWSER_DONWLOAD_TAB_VIEW_H__ +#endif // CHROME_BROWSER_VIEWS_DONWLOAD_TAB_VIEW_H__ diff --git a/chrome/browser/views/options/advanced_contents_view.cc b/chrome/browser/views/options/advanced_contents_view.cc index 1bb4343..569ca31 100644 --- a/chrome/browser/views/options/advanced_contents_view.cc +++ b/chrome/browser/views/options/advanced_contents_view.cc @@ -19,7 +19,7 @@ #include "chrome/browser/browser.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/download_manager.h" +#include "chrome/browser/download/download_manager.h" #include "chrome/browser/gears_integration.h" #include "chrome/browser/metrics_service.h" #include "chrome/browser/net/dns_global.h" diff --git a/chrome/browser/web_contents.cc b/chrome/browser/web_contents.cc index fd061b3..a5226b6 100644 --- a/chrome/browser/web_contents.cc +++ b/chrome/browser/web_contents.cc @@ -12,7 +12,7 @@ #include "chrome/browser/cache_manager_host.h" #include "chrome/browser/character_encoding.h" #include "chrome/browser/dom_operation_notification_details.h" -#include "chrome/browser/download_manager.h" +#include "chrome/browser/download/download_manager.h" #include "chrome/browser/find_in_page_controller.h" #include "chrome/browser/find_notification_details.h" #include "chrome/browser/google_util.h" diff --git a/chrome/test/ui/ui_tests.vcproj b/chrome/test/ui/ui_tests.vcproj index 4c9ffac..d231ddc 100644 --- a/chrome/test/ui/ui_tests.vcproj +++ b/chrome/test/ui/ui_tests.vcproj @@ -234,7 +234,7 @@ Name="TestDownload" > <File - RelativePath="..\..\browser\download_uitest.cc" + RelativePath="..\..\browser\download\download_uitest.cc" > </File> </Filter> diff --git a/chrome/test/unit/unittests.vcproj b/chrome/test/unit/unittests.vcproj index aa849f3..cbb0019 100644 --- a/chrome/test/unit/unittests.vcproj +++ b/chrome/test/unit/unittests.vcproj @@ -670,7 +670,7 @@ Name="TestDownload" > <File - RelativePath="..\..\browser\download_manager_unittest.cc" + RelativePath="..\..\browser\download\download_manager_unittest.cc" > </File> </Filter> |