Second try of landing chrome_resources project. Changes from last time:

- fix scons dependencies by adding a target for grit/theme_resources.h
- fix mac build by adding grit to unittest include path
- fix check deps by adding rules for /grit dir.

Create a chrome_resources.vcproj that holds grd files that hold
non-string resources.  Put browser_resources.grd into this vcproj.

Port theme_resources.rc/theme_resources.h to theme_resources.grd
and put it in the vcproj too.

I did a find/replace on the theme_resources include line.

Modify grit so header files go in grit_generated_resources/grit/
so the include path can be cleaner.  I'll migrate the others
in follow up patches.

theme_resources.rc had a conditional include of distribution_resources.rc
so I had to add support for preprocessor defines to visual studio.

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


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

8 files changed, 7 insertions, 7 deletions

diff --git a/chrome/views/DEPS b/chrome/views/DEPS
index 7256113..e0edd3e 100644
--- a/chrome/views/DEPS
+++ b/chrome/views/DEPS
@@ -3,6 +3,7 @@ include_rules = [
   "+chrome/app/theme",

   "+chrome/browser",

   "+chrome/browser/views",

+  "+grit",  # For generated headers
   "+skia/ext",

   "+skia/include",

   "+webkit/glue",

diff --git a/chrome/views/custom_frame_window.cc b/chrome/views/custom_frame_window.cc
index 9dc3de7..e46f624 100644
--- a/chrome/views/custom_frame_window.cc
+++ b/chrome/views/custom_frame_window.cc
@@ -7,7 +7,7 @@
 #include "base/gfx/point.h"
 #include "base/gfx/size.h"
 #include "base/win_util.h"
-#include "chrome/app/theme/theme_resources.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"
diff --git a/chrome/views/menu_button.cc b/chrome/views/menu_button.cc
index 011a8b3..0b696ff 100644
--- a/chrome/views/menu_button.cc
+++ b/chrome/views/menu_button.cc
@@ -7,7 +7,7 @@
 
 #include "chrome/views/menu_button.h"
 
-#include "chrome/app/theme/theme_resources.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"
diff --git a/chrome/views/painter.cc b/chrome/views/painter.cc
index e20820c..c79a53c 100644
--- a/chrome/views/painter.cc
+++ b/chrome/views/painter.cc
@@ -5,7 +5,6 @@
 #include "chrome/views/painter.h"
 
 #include "base/logging.h"
-#include "chrome/app/theme/theme_resources.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/resource_bundle.h"
 #include "skia/include/SkBitmap.h"
diff --git a/chrome/views/scroll_view.cc b/chrome/views/scroll_view.cc
index a440dd1..cb40f74 100644
--- a/chrome/views/scroll_view.cc
+++ b/chrome/views/scroll_view.cc
@@ -5,7 +5,7 @@
 #include "chrome/views/scroll_view.h"
 
 #include "base/logging.h"
-#include "chrome/app/theme/theme_resources.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"
diff --git a/chrome/views/text_button.cc b/chrome/views/text_button.cc
index 30019c4..1e98f7a 100644
--- a/chrome/views/text_button.cc
+++ b/chrome/views/text_button.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/views/text_button.h"
 
-#include "chrome/app/theme/theme_resources.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"
diff --git a/chrome/views/throbber.cc b/chrome/views/throbber.cc
index 2b6b215..4b01198 100644
--- a/chrome/views/throbber.cc
+++ b/chrome/views/throbber.cc
@@ -5,7 +5,7 @@
 #include "chrome/views/throbber.h"
 
 #include "base/time.h"
-#include "chrome/app/theme/theme_resources.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"
diff --git a/chrome/views/tree_view.cc b/chrome/views/tree_view.cc
index 7d37d42e..dbd0c75 100644
--- a/chrome/views/tree_view.cc
+++ b/chrome/views/tree_view.cc
@@ -7,7 +7,7 @@
 #include <shellapi.h>
 
 #include "base/win_util.h"
-#include "chrome/app/theme/theme_resources.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"