diff options
| author | rahulk@google.com <rahulk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-21 19:33:13 +0000 |
|---|---|---|
| committer | rahulk@google.com <rahulk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-21 19:33:13 +0000 |
| commit | 945c16c976d14eb0944ffaaadae040cad4262c0c (patch) | |
| tree | 4c44a9abaebf7436c89ceeb7bb1f096f18333784 /chrome/app | |
| parent | 9638a0712a9a1f7fe7404f0f6b1bb6d6c0cfa13a (diff) | |
| download | chromium_src-945c16c976d14eb0944ffaaadae040cad4262c0c.zip chromium_src-945c16c976d14eb0944ffaaadae040cad4262c0c.tar.gz chromium_src-945c16c976d14eb0944ffaaadae040cad4262c0c.tar.bz2 | |
Unrollback r1158.
BUG=1296800
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1170 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/theme/google_theme_resources.rc | 15 | ||||
| -rw-r--r-- | chrome/app/theme/theme_dll.vcproj | 4 | ||||
| -rw-r--r-- | chrome/app/theme/theme_resources.rc | 4 |
3 files changed, 20 insertions, 3 deletions
diff --git a/chrome/app/theme/google_theme_resources.rc b/chrome/app/theme/google_theme_resources.rc new file mode 100644 index 0000000..5c16eeb --- /dev/null +++ b/chrome/app/theme/google_theme_resources.rc @@ -0,0 +1,15 @@ +// Resources used by common/*.
+//
+// Paths in this file are relative to the current file.
+
+#include "theme_resources.h"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// data resources
+//
+
+#if defined(GOOGLE_CHROME_BUILD)
+IDR_DISTRIBUTOR_LOGO BINDATA "distributor_logo.png"
+IDR_DISTRIBUTOR_LOGO_LIGHT BINDATA "distributor_logo_light.png"
+#endif
diff --git a/chrome/app/theme/theme_dll.vcproj b/chrome/app/theme/theme_dll.vcproj index ea1904d..66c7925 100644 --- a/chrome/app/theme/theme_dll.vcproj +++ b/chrome/app/theme/theme_dll.vcproj @@ -147,6 +147,10 @@ RelativePath="theme_resources.rc" > </File> + <File + RelativePath="google_theme_resources.rc" + > + </File> </Files> <Globals> </Globals> diff --git a/chrome/app/theme/theme_resources.rc b/chrome/app/theme/theme_resources.rc index 5560c7f..a55f83a 100644 --- a/chrome/app/theme/theme_resources.rc +++ b/chrome/app/theme/theme_resources.rc @@ -1,6 +1,6 @@ // Resources used by common/*. // -// Paths in this file are relative to SolutionDir. +// Paths in this file are relative to current file. #include "theme_resources.h" @@ -306,5 +306,3 @@ IDR_FIND_DLG_MIDDLE_BB_BACKGROUND BINDATA "find_dlg_middle_bb_bg.png" IDR_THROBBER_LIGHT BINDATA "throbber_light.png" IDR_OTR_ICON_STANDALONE BINDATA "otr_icon_standalone.png" IDR_PRODUCT_LOGO BINDATA "product_logo.png" -IDR_DISTRIBUTOR_LOGO BINDATA "distributor_logo.png" -IDR_DISTRIBUTOR_LOGO_LIGHT BINDATA "distributor_logo_light.png" |