summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_init.cc
diff options
context:
space:
mode:
authortc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-12 17:14:07 +0000
committertc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-12 17:14:07 +0000
commit79a634351d4c69ce9570ab5ec952556347891db7 (patch)
treee43e152e410305fd28c637d990fcf863623c427b /chrome/browser/browser_init.cc
parente7736d75f1a69e8af68ca3d5610bce84c215cf0e (diff)
downloadchromium_src-79a634351d4c69ce9570ab5ec952556347891db7.zip
chromium_src-79a634351d4c69ce9570ab5ec952556347891db7.tar.gz
chromium_src-79a634351d4c69ce9570ab5ec952556347891db7.tar.bz2
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
Diffstat (limited to 'chrome/browser/browser_init.cc')
-rw-r--r--chrome/browser/browser_init.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc
index 74c65d6..413432e 100644
--- a/chrome/browser/browser_init.cc
+++ b/chrome/browser/browser_init.cc
@@ -35,7 +35,7 @@
#include "base/win_util.h"
#include "chrome/app/locales/locale_settings.h"
-#include "chrome/app/theme/theme_resources.h"
+#include "grit/theme_resources.h"
#include "chrome/browser/automation/automation_provider.h"
#include "chrome/browser/automation/automation_provider_list.h"
#include "chrome/browser/net/url_fixer_upper.h"