From 9c791f97c1eec79f10baf6144e6a0526cb4ebad0 Mon Sep 17 00:00:00 2001 From: "rahulk@google.com" Date: Fri, 22 Aug 2008 22:17:57 +0000 Subject: 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 --- chrome/app/chrome_dll.rc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'chrome/app/chrome_dll.rc') 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 ///////////////////////////////////////////////////////////////////////////// // -- cgit v1.1