diff options
| author | rahulk@google.com <rahulk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-22 22:17:57 +0000 |
|---|---|---|
| committer | rahulk@google.com <rahulk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-22 22:17:57 +0000 |
| commit | 9c791f97c1eec79f10baf6144e6a0526cb4ebad0 (patch) | |
| tree | 30062562d605e8b9db0e7a535cf382d298727f11 /chrome/app/chrome_dll.rc | |
| parent | 4f7ce3e8339973a5e790b925ee1463e338ed0edb (diff) | |
| download | chromium_src-9c791f97c1eec79f10baf6144e6a0526cb4ebad0.zip chromium_src-9c791f97c1eec79f10baf6144e6a0526cb4ebad0.tar.gz chromium_src-9c791f97c1eec79f10baf6144e6a0526cb4ebad0.tar.bz2 | |
Move distribution specific theme images:
- Google Chrome images are in internal repository now and get checked out into app\theme\google_chrome so delete them from app\theme
- Add Chromium images to app\theme\Chromium
- Modify html inlining script to pick up images from different places depending on environment variable (for now the default is google chrome which will change to chromium).
- Moving icon file to private repository as well so delete it from public repository. In its place add chromium icon.
- chromium\product_logo.png is a not actually a logo but just the blue icon in the same size as google_chrome\product_logo.png. This file makes about:version and new tab page look prettier (imo).
BUG=1296800
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1249 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/chrome_dll.rc')
| -rw-r--r-- | chrome/app/chrome_dll.rc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/app/chrome_dll.rc b/chrome/app/chrome_dll.rc index 4d25159..2e6c48d 100644 --- a/chrome/app/chrome_dll.rc +++ b/chrome/app/chrome_dll.rc @@ -142,7 +142,11 @@ END // the icon from the current module). We can perhaps work around this in the // future to get the icon from the .exe, which would save a copy. -IDR_MAINFRAME ICON "resources\\chrome.ico" +#if defined(GOOGLE_CHROME_BUILD) +IDR_MAINFRAME ICON "theme\google_chrome\chrome.ico" +#else +IDR_MAINFRAME ICON "theme\chromium\chromium.ico" +#endif ///////////////////////////////////////////////////////////////////////////// // |