diff options
| author | rahulk@google.com <rahulk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-21 18:18:30 +0000 |
|---|---|---|
| committer | rahulk@google.com <rahulk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-21 18:18:30 +0000 |
| commit | 025a16feb0c23574585de20a7bc6524a9a6a1e06 (patch) | |
| tree | 6199c376b691b50a4b31436a16e9e198a60e8931 /chrome/app | |
| parent | d862fd9d396126f3f06a8061412def6d61d156fd (diff) | |
| download | chromium_src-025a16feb0c23574585de20a7bc6524a9a6a1e06.zip chromium_src-025a16feb0c23574585de20a7bc6524a9a6a1e06.tar.gz chromium_src-025a16feb0c23574585de20a7bc6524a9a6a1e06.tar.bz2 | |
Revert 1158 as it is breaking ui_tests
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1165 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, 3 insertions, 20 deletions
diff --git a/chrome/app/theme/google_theme_resources.rc b/chrome/app/theme/google_theme_resources.rc deleted file mode 100644 index 5c16eeb..0000000 --- a/chrome/app/theme/google_theme_resources.rc +++ /dev/null @@ -1,15 +0,0 @@ -// 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 66c7925..ea1904d 100644 --- a/chrome/app/theme/theme_dll.vcproj +++ b/chrome/app/theme/theme_dll.vcproj @@ -147,10 +147,6 @@ 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 a55f83a..5560c7f 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 current file. +// Paths in this file are relative to SolutionDir. #include "theme_resources.h" @@ -306,3 +306,5 @@ 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" |