Continual header pruning

BUG=none
TEST=none

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

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

2 files changed, 16 insertions, 13 deletions

diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index 1ecd13c..5a0ac80 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -22,6 +22,8 @@
 #include "chrome/common/child_process_logging.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/db_message_filter.h"
+#include "chrome/common/dom_storage_common.h"
+#include "chrome/common/extensions/extension_extent.h"
 #include "chrome/common/plugin_messages.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/renderer_preferences.h"
@@ -44,6 +46,7 @@
 #include "chrome/renderer/extensions/js_only_v8_extensions.h"
 #include "chrome/renderer/extensions/renderer_extension_bindings.h"
 #include "chrome/renderer/external_extension.h"
+#include "chrome/renderer/gpu_channel_host.h"
 #include "chrome/renderer/indexed_db_dispatcher.h"
 #include "chrome/renderer/loadtimes_extension_bindings.h"
 #include "chrome/renderer/net/renderer_net_predictor.h"
@@ -51,6 +54,7 @@
 #include "chrome/renderer/render_process_impl.h"
 #include "chrome/renderer/render_view.h"
 #include "chrome/renderer/render_view_visitor.h"
+#include "chrome/renderer/renderer_histogram_snapshots.h"
 #include "chrome/renderer/renderer_webindexeddatabase_impl.h"
 #include "chrome/renderer/renderer_webkitclient_impl.h"
 #include "chrome/renderer/spellchecker/spellcheck.h"
@@ -191,6 +195,15 @@ class RenderViewZoomer : public RenderViewVisitor {
 };
 }  // namespace
 
+// Contains extension-related data that the renderer needs to know about.
+// TODO(mpcomplete): this doesn't feel like it belongs here. Find a better
+// place.
+struct RenderThread::ExtensionInfo {
+  std::string extension_id;
+  ExtensionExtent web_extent;
+  ExtensionExtent browse_extent;
+};
+
 // When we run plugins in process, we actually run them on the render thread,
 // which means that we need to make the render thread pump UI events.
 RenderThread::RenderThread() {
diff --git a/chrome/renderer/render_thread.h b/chrome/renderer/render_thread.h
index 70c5516..9fbb1ed 100644
--- a/chrome/renderer/render_thread.h
+++ b/chrome/renderer/render_thread.h
@@ -17,10 +17,6 @@
 #include "build/build_config.h"
 #include "chrome/common/child_thread.h"
 #include "chrome/common/css_colors.h"
-#include "chrome/common/dom_storage_common.h"
-#include "chrome/common/extensions/extension_extent.h"
-#include "chrome/renderer/gpu_channel_host.h"
-#include "chrome/renderer/renderer_histogram_snapshots.h"
 #include "chrome/renderer/visitedlink_slave.h"
 #include "gfx/native_widget_types.h"
 #include "ipc/ipc_channel_handle.h"
@@ -31,10 +27,12 @@ class CookieMessageFilter;
 class DBMessageFilter;
 class DevToolsAgentFilter;
 class FilePath;
+class GpuChannelHost;
 class IndexedDBDispatcher;
 class ListValue;
 class NullableString16;
 class RendererHistogram;
+class RendererHistogramSnapshots;
 class RendererNetPredictor;
 class RendererWebKitClientImpl;
 class SpellCheck;
@@ -225,15 +223,6 @@ class RenderThread : public RenderThreadBase,
   std::string GetExtensionIdByBrowseExtent(const GURL& url);
 
  private:
-  // Contains extension-related data that the renderer needs to know about.
-  // TODO(mpcomplete): this doesn't feel like it belongs here. Find a better
-  // place.
-  struct ExtensionInfo {
-    std::string extension_id;
-    ExtensionExtent web_extent;
-    ExtensionExtent browse_extent;
-  };
-
   virtual void OnControlMessageReceived(const IPC::Message& msg);
 
   void Init();
@@ -368,6 +357,7 @@ class RenderThread : public RenderThreadBase,
 
   // A list of extension web extents, which tells us which URLs belong to an
   // installed app.
+  struct ExtensionInfo;
   std::vector<ExtensionInfo> extension_extents_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderThread);