diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-09 21:58:55 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-09 21:58:55 +0000 |
| commit | 1bce0b66d9de24d21afc8cd672f7e1100dfe0b55 (patch) | |
| tree | 0fa9daf6423986af953f53c5fb0f226034fcc773 /chrome/app | |
| parent | 4ca1372726d465d18036bf3142f45ca47006ba4e (diff) | |
| download | chromium_src-1bce0b66d9de24d21afc8cd672f7e1100dfe0b55.zip chromium_src-1bce0b66d9de24d21afc8cd672f7e1100dfe0b55.tar.gz chromium_src-1bce0b66d9de24d21afc8cd672f7e1100dfe0b55.tar.bz2 | |
Move browser_resources.rc into a a grd file. While I'm at it,
I removed the flatten_html visual studio rule and just rolled the
functionality directly into GRIT.
The sln change is to have browser depend on browser_resources (now needed for browser_resources.h).
Review URL: http://codereview.chromium.org/21148
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9418 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/chrome_dll.rc | 4 | ||||
| -rw-r--r-- | chrome/app/chrome_dll.vcproj | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/chrome/app/chrome_dll.rc b/chrome/app/chrome_dll.rc index 07cf3ca..940d57b 100644 --- a/chrome/app/chrome_dll.rc +++ b/chrome/app/chrome_dll.rc @@ -235,6 +235,10 @@ END #include "installer_util_strings.rc" +#ifdef CHROME_PERSONALIZATION +#include "chrome\\personalization\\personalization_resources.rc" +#endif + // We include these resources because all ICON types need to be in the // same .rc file. See: // http://www.technewsgroups.net/group/microsoft.public.dotnet.general/topic2111.aspx diff --git a/chrome/app/chrome_dll.vcproj b/chrome/app/chrome_dll.vcproj index 2a204f1..87135dd 100644 --- a/chrome/app/chrome_dll.vcproj +++ b/chrome/app/chrome_dll.vcproj @@ -164,11 +164,7 @@ > </File> <File - RelativePath="..\browser\browser_resources.h" - > - </File> - <File - RelativePath="..\browser\browser_resources.rc" + RelativePath="$(OutDir)\grit_derived_sources\browser_resources.rc" > </File> <File |