Update include paths for grit files. Go ahead and resort

the headers too.

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

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

4 files changed, 6 insertions, 11 deletions

diff --git a/chrome/renderer/localized_error.cc b/chrome/renderer/localized_error.cc
index ef9e5af..af89563 100644
--- a/chrome/renderer/localized_error.cc
+++ b/chrome/renderer/localized_error.cc
@@ -9,13 +9,12 @@
 #include "base/values.h"
 #include "chrome/common/l10n_util.h"
 #include "googleurl/src/gurl.h"
+#include "grit/generated_resources.h"
 #include "net/base/escape.h"
 #include "net/base/net_errors.h"
 #include "webkit/glue/weberror.h"
 #include "webkit/glue/webkit_glue.h"
 
-#include "generated_resources.h"
-
 namespace {
 
 static const char* kRedirectLoopLearnMoreUrl =
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index d87b327..4a5f360 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -32,6 +32,8 @@
 #include "chrome/renderer/visitedlink_slave.h"
 #include "chrome/renderer/webmediaplayer_delegate_impl.h"
 #include "chrome/renderer/webplugin_delegate_proxy.h"
+#include "grit/generated_resources.h"
+#include "grit/renderer_resources.h"
 #include "net/base/escape.h"
 #include "net/base/net_errors.h"
 #include "skia/ext/bitmap_platform_device.h"
@@ -56,9 +58,6 @@
 #include "webkit/glue/weburlrequest.h"
 #include "webkit/glue/webview.h"
 
-#include "generated_resources.h"
-#include "grit/renderer_resources.h"
-
 #if defined(OS_WIN)
 // TODO(port): these files are currently Windows only because they concern:
 //   * plugins
diff --git a/chrome/renderer/renderer_main.cc b/chrome/renderer/renderer_main.cc
index 8ca5346..b79e9e5 100644
--- a/chrome/renderer/renderer_main.cc
+++ b/chrome/renderer/renderer_main.cc
@@ -18,14 +18,13 @@
 #include "chrome/common/resource_bundle.h"
 #include "chrome/renderer/renderer_main_platform_delegate.h"
 #include "chrome/renderer/render_process.h"
+#include "grit/chromium_strings.h"
+#include "grit/generated_resources.h"
 
 #if defined(OS_LINUX)
 #include <gtk/gtk.h>
 #endif
 
-#include "chromium_strings.h"
-#include "generated_resources.h"
-
 // This function provides some ways to test crash and assertion handling
 // behavior of the renderer.
 static void HandleRendererErrorTestParameters(const CommandLine& command_line) {
diff --git a/chrome/renderer/webplugin_delegate_proxy.cc b/chrome/renderer/webplugin_delegate_proxy.cc
index 0e63b57..cb18ed6 100644
--- a/chrome/renderer/webplugin_delegate_proxy.cc
+++ b/chrome/renderer/webplugin_delegate_proxy.cc
@@ -6,14 +6,11 @@
 
 #include <atlbase.h>
 
-#include "generated_resources.h"
-
 #include "base/logging.h"
 #include "base/ref_counted.h"
 #include "base/string_util.h"
 #include "base/gfx/size.h"
 #include "base/gfx/native_widget_types.h"
-
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/gfx/emf.h"
@@ -27,6 +24,7 @@
 #include "chrome/renderer/render_thread.h"
 #include "chrome/renderer/render_view.h"
 #include "googleurl/src/gurl.h"
+#include "grit/generated_resources.h"
 #include "net/base/mime_util.h"
 #include "webkit/glue/glue_util.h"
 #include "webkit/glue/webframe.h"