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

9 files changed, 12 insertions, 21 deletions

diff --git a/chrome/browser/bookmarks/bookmark_codec.cc b/chrome/browser/bookmarks/bookmark_codec.cc
index 6d6274a..fc4b592 100644
--- a/chrome/browser/bookmarks/bookmark_codec.cc
+++ b/chrome/browser/bookmarks/bookmark_codec.cc
@@ -9,8 +9,7 @@
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/common/l10n_util.h"
 #include "googleurl/src/gurl.h"
-
-#include "generated_resources.h"
+#include "grit/generated_resources.h"
 
 using base::Time;
 
diff --git a/chrome/browser/bookmarks/bookmark_context_menu.cc b/chrome/browser/bookmarks/bookmark_context_menu.cc
index 0ca63246..c4d067b 100644
--- a/chrome/browser/bookmarks/bookmark_context_menu.cc
+++ b/chrome/browser/bookmarks/bookmark_context_menu.cc
@@ -20,8 +20,7 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/views/window.h"
-
-#include "generated_resources.h"
+#include "grit/generated_resources.h"
 
 namespace {
 
diff --git a/chrome/browser/bookmarks/bookmark_context_menu_test.cc b/chrome/browser/bookmarks/bookmark_context_menu_test.cc
index 0bec1ca..e5a07ad 100644
--- a/chrome/browser/bookmarks/bookmark_context_menu_test.cc
+++ b/chrome/browser/bookmarks/bookmark_context_menu_test.cc
@@ -11,10 +11,9 @@
 #include "chrome/common/pref_service.h"
 #include "chrome/browser/tab_contents/page_navigator.h"
 #include "chrome/test/testing_profile.h"
+#include "grit/generated_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-#include "generated_resources.h"
-
 namespace {
 
 // PageNavigator implementation that records the URL.
diff --git a/chrome/browser/bookmarks/bookmark_folder_tree_model.cc b/chrome/browser/bookmarks/bookmark_folder_tree_model.cc
index 7473d62..a743255 100644
--- a/chrome/browser/bookmarks/bookmark_folder_tree_model.cc
+++ b/chrome/browser/bookmarks/bookmark_folder_tree_model.cc
@@ -4,11 +4,10 @@
 
 #include "chrome/browser/bookmarks/bookmark_folder_tree_model.h"
 
-#include "grit/theme_resources.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/resource_bundle.h"
-
-#include "generated_resources.h"
+#include "grit/generated_resources.h"
+#include "grit/theme_resources.h"
 
 BookmarkFolderTreeModel::BookmarkFolderTreeModel(BookmarkModel* model)
     : views::TreeNodeModel<FolderNode>(new FolderNode(NULL)),
diff --git a/chrome/browser/bookmarks/bookmark_folder_tree_model_unittest.cc b/chrome/browser/bookmarks/bookmark_folder_tree_model_unittest.cc
index c6f0a00..ac0037b 100644
--- a/chrome/browser/bookmarks/bookmark_folder_tree_model_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_folder_tree_model_unittest.cc
@@ -7,10 +7,9 @@
 #include "chrome/browser/bookmarks/bookmark_folder_tree_model.h"
 #include "chrome/test/testing_profile.h"
 #include "chrome/views/tree_view.h"
+#include "grit/generated_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-#include "generated_resources.h"
-
 // Base class for bookmark model tests.
 // Initial state of the bookmark model is as follows:
 // bb
diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc
index cb53639..12c8c97 100644
--- a/chrome/browser/bookmarks/bookmark_model.cc
+++ b/chrome/browser/bookmarks/bookmark_model.cc
@@ -12,8 +12,7 @@
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/scoped_vector.h"
-
-#include "generated_resources.h"
+#include "grit/generated_resources.h"
 
 using base::Time;
 
diff --git a/chrome/browser/bookmarks/bookmark_table_model.cc b/chrome/browser/bookmarks/bookmark_table_model.cc
index d2f4e6d..99c2f29 100644
--- a/chrome/browser/bookmarks/bookmark_table_model.cc
+++ b/chrome/browser/bookmarks/bookmark_table_model.cc
@@ -9,13 +9,12 @@
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/time_format.h"
-#include "grit/theme_resources.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/resource_bundle.h"
 #include "googleurl/src/gurl.h"
-
-#include "generated_resources.h"
+#include "grit/generated_resources.h"
+#include "grit/theme_resources.h"
 
 namespace {
 
diff --git a/chrome/browser/bookmarks/bookmark_table_model_unittest.cc b/chrome/browser/bookmarks/bookmark_table_model_unittest.cc
index 04055ee..b709b28 100644
--- a/chrome/browser/bookmarks/bookmark_table_model_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_table_model_unittest.cc
@@ -6,10 +6,9 @@
 #include "base/time.h"
 #include "chrome/browser/bookmarks/bookmark_table_model.h"
 #include "chrome/test/testing_profile.h"
+#include "grit/generated_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-#include "generated_resources.h"
-
 using base::Time;
 using base::TimeDelta;
 
diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc
index 595220fb..d6a83691 100644
--- a/chrome/browser/bookmarks/bookmark_utils.cc
+++ b/chrome/browser/bookmarks/bookmark_utils.cc
@@ -19,9 +19,8 @@
 #include "chrome/common/os_exchange_data.h"
 #include "chrome/views/event.h"
 #include "chrome/views/tree_node_iterator.h"
-
-#include "chromium_strings.h"
-#include "generated_resources.h"
+#include "grit/chromium_strings.h"
+#include "grit/generated_resources.h"
 
 namespace {