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

15 files changed, 18 insertions, 26 deletions

diff --git a/chrome/views/accelerator.cc b/chrome/views/accelerator.cc
index dfba1b0..8619394 100644
--- a/chrome/views/accelerator.cc
+++ b/chrome/views/accelerator.cc
@@ -7,7 +7,7 @@
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "chrome/common/l10n_util.h"
-#include "generated_resources.h"
+#include "grit/generated_resources.h"
 
 namespace views {
 
diff --git a/chrome/views/bitmap_scroll_bar.cc b/chrome/views/bitmap_scroll_bar.cc
index 54b4f28..6239fc0 100644
--- a/chrome/views/bitmap_scroll_bar.cc
+++ b/chrome/views/bitmap_scroll_bar.cc
@@ -10,10 +10,9 @@
 #include "chrome/views/menu.h"
 #include "chrome/views/scroll_view.h"
 #include "chrome/views/widget.h"
+#include "grit/generated_resources.h"
 #include "skia/include/SkBitmap.h"
 
-#include "generated_resources.h"
-
 #undef min
 #undef max
 
diff --git a/chrome/views/button.cc b/chrome/views/button.cc
index 36c228a..3c675d5 100644
--- a/chrome/views/button.cc
+++ b/chrome/views/button.cc
@@ -12,10 +12,9 @@
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/throb_animation.h"
 #include "chrome/views/event.h"
+#include "grit/generated_resources.h"
 #include "skia/ext/image_operations.h"
 
-#include "generated_resources.h"
-
 namespace views {
 
 static const int kDefaultWidth = 16;   // Default button width if no theme.
diff --git a/chrome/views/button_dropdown.cc b/chrome/views/button_dropdown.cc
index 5eb553e..6c587ae 100644
--- a/chrome/views/button_dropdown.cc
+++ b/chrome/views/button_dropdown.cc
@@ -9,8 +9,7 @@
 #include "chrome/common/l10n_util.h"
 #include "chrome/views/view_menu_delegate.h"
 #include "chrome/views/widget.h"
-
-#include "generated_resources.h"
+#include "grit/generated_resources.h"
 
 namespace views {
 
diff --git a/chrome/views/chrome_menu.cc b/chrome/views/chrome_menu.cc
index d7d6618..f226987 100644
--- a/chrome/views/chrome_menu.cc
+++ b/chrome/views/chrome_menu.cc
@@ -23,7 +23,7 @@
 #include "chrome/views/root_view.h"
 #include "chrome/views/view_constants.h"
 #include "chrome/views/widget_win.h"
-#include "generated_resources.h"
+#include "grit/generated_resources.h"
 #include "skia/ext/skia_utils_win.h"
 
 #undef min
diff --git a/chrome/views/custom_frame_window.cc b/chrome/views/custom_frame_window.cc
index 4e57ee0..79ce069 100644
--- a/chrome/views/custom_frame_window.cc
+++ b/chrome/views/custom_frame_window.cc
@@ -7,7 +7,6 @@
 #include "base/gfx/point.h"
 #include "base/gfx/size.h"
 #include "base/win_util.h"
-#include "grit/theme_resources.h"
 #include "chrome/common/gfx/path.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/gfx/chrome_font.h"
@@ -21,7 +20,8 @@
 #include "chrome/views/root_view.h"
 #include "chrome/views/window_delegate.h"
 #include "chrome/views/window_resources.h"
-#include "generated_resources.h"
+#include "grit/generated_resources.h"
+#include "grit/theme_resources.h"
 
 namespace views {
 
diff --git a/chrome/views/dialog_client_view.cc b/chrome/views/dialog_client_view.cc
index fc37321..58618b2 100644
--- a/chrome/views/dialog_client_view.cc
+++ b/chrome/views/dialog_client_view.cc
@@ -17,7 +17,7 @@
 #include "chrome/common/win_util.h"
 #include "chrome/views/dialog_delegate.h"
 #include "chrome/views/window.h"
-#include "generated_resources.h"
+#include "grit/generated_resources.h"
 
 namespace views {
 
diff --git a/chrome/views/menu_button.cc b/chrome/views/menu_button.cc
index ff0400a..ad8ace1 100644
--- a/chrome/views/menu_button.cc
+++ b/chrome/views/menu_button.cc
@@ -7,7 +7,6 @@
 
 #include "chrome/views/menu_button.h"
 
-#include "grit/theme_resources.h"
 #include "chrome/common/drag_drop_types.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/l10n_util.h"
@@ -18,8 +17,8 @@
 #include "chrome/views/root_view.h"
 #include "chrome/views/view_menu_delegate.h"
 #include "chrome/views/widget.h"
-
-#include "generated_resources.h"
+#include "grit/generated_resources.h"
+#include "grit/theme_resources.h"
 
 using base::Time;
 using base::TimeDelta;
diff --git a/chrome/views/message_box_view.cc b/chrome/views/message_box_view.cc
index 6851ed4..818cf50 100644
--- a/chrome/views/message_box_view.cc
+++ b/chrome/views/message_box_view.cc
@@ -10,8 +10,7 @@
 #include "chrome/common/l10n_util.h"
 #include "chrome/views/checkbox.h"
 #include "chrome/views/client_view.h"
-
-#include "generated_resources.h"
+#include "grit/generated_resources.h"
 
 static const int kDefaultMessageWidth = 320;
 
diff --git a/chrome/views/scroll_view.cc b/chrome/views/scroll_view.cc
index cb40f74..e30e68d 100644
--- a/chrome/views/scroll_view.cc
+++ b/chrome/views/scroll_view.cc
@@ -5,10 +5,10 @@
 #include "chrome/views/scroll_view.h"
 
 #include "base/logging.h"
-#include "grit/theme_resources.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/views/native_scroll_bar.h"
 #include "chrome/views/root_view.h"
+#include "grit/theme_resources.h"
 
 namespace views {
 
diff --git a/chrome/views/text_button.cc b/chrome/views/text_button.cc
index 1e98f7a..f185745 100644
--- a/chrome/views/text_button.cc
+++ b/chrome/views/text_button.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/views/text_button.h"
 
-#include "grit/theme_resources.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/common/throb_animation.h"
@@ -12,8 +11,8 @@
 #include "chrome/views/button.h"
 #include "chrome/views/event.h"
 #include "chrome/views/view_menu_delegate.h"
-
-#include "generated_resources.h"
+#include "grit/generated_resources.h"
+#include "grit/theme_resources.h"
 
 namespace views {
 
diff --git a/chrome/views/text_field.cc b/chrome/views/text_field.cc
index dc1b66c..deeed6e 100644
--- a/chrome/views/text_field.cc
+++ b/chrome/views/text_field.cc
@@ -24,10 +24,9 @@
 #include "chrome/views/hwnd_view.h"
 #include "chrome/views/menu.h"
 #include "chrome/views/widget.h"
+#include "grit/generated_resources.h"
 #include "skia/ext/skia_utils_win.h"
 
-#include "generated_resources.h"
-
 using gfx::NativeTheme;
 
 namespace views {
diff --git a/chrome/views/throbber.cc b/chrome/views/throbber.cc
index 4b01198..1f80ff4 100644
--- a/chrome/views/throbber.cc
+++ b/chrome/views/throbber.cc
@@ -5,10 +5,10 @@
 #include "chrome/views/throbber.h"
 
 #include "base/time.h"
-#include "grit/theme_resources.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/resource_bundle.h"
+#include "grit/theme_resources.h"
 #include "skia/include/SkBitmap.h"
 
 using base::Time;
diff --git a/chrome/views/tree_view.cc b/chrome/views/tree_view.cc
index dbd0c75..a9229c8 100644
--- a/chrome/views/tree_view.cc
+++ b/chrome/views/tree_view.cc
@@ -7,7 +7,6 @@
 #include <shellapi.h>
 
 #include "base/win_util.h"
-#include "grit/theme_resources.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/gfx/icon_util.h"
 #include "chrome/common/l10n_util.h"
@@ -15,6 +14,7 @@
 #include "chrome/common/stl_util-inl.h"
 #include "chrome/views/focus_manager.h"
 #include "chrome/views/widget.h"
+#include "grit/theme_resources.h"
 
 namespace views {
 
diff --git a/chrome/views/window.cc b/chrome/views/window.cc
index 84662a9..1b74a41 100644
--- a/chrome/views/window.cc
+++ b/chrome/views/window.cc
@@ -18,8 +18,7 @@
 #include "chrome/views/non_client_view.h"
 #include "chrome/views/root_view.h"
 #include "chrome/views/window_delegate.h"
-
-#include "generated_resources.h"
+#include "grit/generated_resources.h"
 
 namespace views {