Reduce header dependencies in chrome/browser/

In my scan of headers I got up to browser/gtk/

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

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

9 files changed, 16 insertions, 18 deletions

diff --git a/chrome/browser/download/download_file.cc b/chrome/browser/download/download_file.cc
index 5dca83e..6d8b675 100644
--- a/chrome/browser/download/download_file.cc
+++ b/chrome/browser/download/download_file.cc
@@ -9,6 +9,7 @@
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/task.h"
+#include "base/thread.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_manager.h"
diff --git a/chrome/browser/download/download_file.h b/chrome/browser/download/download_file.h
index 0b3bc31..9706d4a 100644
--- a/chrome/browser/download/download_file.h
+++ b/chrome/browser/download/download_file.h
@@ -41,24 +41,23 @@
 #ifndef CHROME_BROWSER_DOWNLOAD_DOWNLOAD_FILE_H_
 #define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_FILE_H_
 
-#include <string>
+#include <map>
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/file_path.h"
 #include "base/gfx/native_widget_types.h"
 #include "base/hash_tables.h"
 #include "base/lock.h"
 #include "base/ref_counted.h"
-#include "base/thread.h"
 #include "base/timer.h"
-#include "chrome/browser/history/download_types.h"
+#include "googleurl/src/gurl.h"
 
 namespace net {
 class IOBuffer;
 }
+struct DownloadCreateInfo;
 class DownloadManager;
-class FilePath;
-class GURL;
 class MessageLoop;
 class ResourceDispatcherHost;
 class URLRequestContext;
diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc
index e22821a..417d40c 100644
--- a/chrome/browser/download/download_util.cc
+++ b/chrome/browser/download/download_util.cc
@@ -4,10 +4,11 @@
 //
 // Download utility implementation
 
-#include <string>
-
 #include "chrome/browser/download/download_util.h"
 
+#include <string>
+
+#include "app/gfx/canvas.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/file_util.h"
diff --git a/chrome/browser/download/download_util.h b/chrome/browser/download/download_util.h
index deb9468e..11edd5e 100644
--- a/chrome/browser/download/download_util.h
+++ b/chrome/browser/download/download_util.h
@@ -10,7 +10,6 @@
 #include <set>
 #include <string>
 
-#include "app/gfx/canvas.h"
 #include "base/basictypes.h"
 #include "base/task.h"
 
@@ -18,6 +17,10 @@
 #include "views/view.h"
 #endif
 
+namespace gfx {
+class Canvas;
+}
+
 class BaseDownloadItemModel;
 class DownloadItem;
 class SkBitmap;
diff --git a/chrome/browser/download/save_file_manager.cc b/chrome/browser/download/save_file_manager.cc
index 48a3797..83106a2 100644
--- a/chrome/browser/download/save_file_manager.cc
+++ b/chrome/browser/download/save_file_manager.cc
@@ -11,6 +11,7 @@
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/task.h"
+#include "base/thread.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/save_file.h"
 #include "chrome/browser/download/save_package.h"
diff --git a/chrome/browser/download/save_file_manager.h b/chrome/browser/download/save_file_manager.h
index ac6c1c8..34c2f12 100644
--- a/chrome/browser/download/save_file_manager.h
+++ b/chrome/browser/download/save_file_manager.h
@@ -58,13 +58,10 @@
 #ifndef CHROME_BROWSER_DOWNLOAD_SAVE_FILE_MANAGER_H__
 #define CHROME_BROWSER_DOWNLOAD_SAVE_FILE_MANAGER_H__
 
-#include <utility>
-
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/hash_tables.h"
 #include "base/ref_counted.h"
-#include "base/thread.h"
 #include "chrome/browser/download/save_types.h"
 
 namespace net {
diff --git a/chrome/browser/download/save_item.h b/chrome/browser/download/save_item.h
index 8855692..7857b97 100644
--- a/chrome/browser/download/save_item.h
+++ b/chrome/browser/download/save_item.h
@@ -5,8 +5,6 @@
 #ifndef CHROME_BROWSER_DOWNLOAD_SAVE_ITEM_H__
 #define CHROME_BROWSER_DOWNLOAD_SAVE_ITEM_H__
 
-#include <string>
-
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "chrome/browser/download/save_types.h"
diff --git a/chrome/browser/download/save_package.cc b/chrome/browser/download/save_package.cc
index a457053..7e90cbb 100644
--- a/chrome/browser/download/save_package.cc
+++ b/chrome/browser/download/save_package.cc
@@ -19,6 +19,7 @@
 #include "chrome/browser/download/download_shelf.h"
 #include "chrome/browser/download/save_file.h"
 #include "chrome/browser/download/save_file_manager.h"
+#include "chrome/browser/download/save_item.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
diff --git a/chrome/browser/download/save_package.h b/chrome/browser/download/save_package.h
index 5c75936..ef475db 100644
--- a/chrome/browser/download/save_package.h
+++ b/chrome/browser/download/save_package.h
@@ -7,21 +7,17 @@
 
 #include <queue>
 #include <string>
-#include <utility>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
-#include "base/gfx/native_widget_types.h"
 #include "base/hash_tables.h"
 #include "base/ref_counted.h"
-#include "chrome/common/pref_member.h"
-#include "chrome/browser/download/save_item.h"
-#include "chrome/browser/download/save_types.h"
 #include "chrome/browser/renderer_host/render_view_host_delegate.h"
 #include "chrome/browser/shell_dialogs.h"
 
 class SaveFileManager;
+class SaveItem;
 class SavePackage;
 class DownloadItem;
 class DownloadManager;
@@ -38,6 +34,7 @@ class Thread;
 class Time;
 }
 
+struct SaveFileCreateInfo;
 struct SavePackageParam;
 
 // The SavePackage object manages the process of saving a page as only-html or