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

17 files changed, 27 insertions, 21 deletions

diff --git a/chrome/app/theme/about_background.png b/chrome/app/theme/about_background.png
deleted file mode 100644
index aebd3d7..0000000
--- a/chrome/app/theme/about_background.png
+++ /dev/null
diff --git a/chrome/app/theme/about_background_rtl.png b/chrome/app/theme/about_background_rtl.png
deleted file mode 100644
index f7e7cce..0000000
--- a/chrome/app/theme/about_background_rtl.png
+++ /dev/null
diff --git a/chrome/app/theme/chromium/about_background.png b/chrome/app/theme/chromium/about_background.png
new file mode 100644
index 0000000..479f320
--- /dev/null
+++ b/chrome/app/theme/chromium/about_background.png
diff --git a/chrome/app/theme/chromium/about_background_rtl.png b/chrome/app/theme/chromium/about_background_rtl.png
new file mode 100644
index 0000000..42a31f5
--- /dev/null
+++ b/chrome/app/theme/chromium/about_background_rtl.png
diff --git a/chrome/app/theme/chromium/chromium.ico b/chrome/app/theme/chromium/chromium.ico
new file mode 100644
index 0000000..f267ad8
--- /dev/null
+++ b/chrome/app/theme/chromium/chromium.ico
diff --git a/chrome/app/theme/chromium/product_logo.png b/chrome/app/theme/chromium/product_logo.png
new file mode 100644
index 0000000..65ce343
--- /dev/null
+++ b/chrome/app/theme/chromium/product_logo.png
diff --git a/chrome/app/theme/chromium/wizard_icon.png b/chrome/app/theme/chromium/wizard_icon.png
new file mode 100644
index 0000000..fba699c
--- /dev/null
+++ b/chrome/app/theme/chromium/wizard_icon.png
diff --git a/chrome/app/theme/chromium/wizard_icon_rtl.png b/chrome/app/theme/chromium/wizard_icon_rtl.png
new file mode 100644
index 0000000..755af89
--- /dev/null
+++ b/chrome/app/theme/chromium/wizard_icon_rtl.png
diff --git a/chrome/app/theme/distribution_resources.rc b/chrome/app/theme/distribution_resources.rc
new file mode 100644
index 0000000..4952d42
--- /dev/null
+++ b/chrome/app/theme/distribution_resources.rc
@@ -0,0 +1,26 @@
+// 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_ABOUT_BACKGROUND               BINDATA  "google_chrome/about_background.png"

+IDR_ABOUT_BACKGROUND_RTL           BINDATA  "google_chrome/about_background_rtl.png"

+IDR_DISTRIBUTOR_LOGO               BINDATA  "google_chrome/distributor_logo.png"

+IDR_DISTRIBUTOR_LOGO_LIGHT         BINDATA  "google_chrome/distributor_logo_light.png"

+IDR_PRODUCT_LOGO                   BINDATA  "google_chrome/product_logo.png"

+IDR_WIZARD_ICON                    BINDATA  "google_chrome/wizard_icon.png"

+IDR_WIZARD_ICON_RTL                BINDATA  "google_chrome/wizard_icon_rtl.png"

+#else

+IDR_ABOUT_BACKGROUND               BINDATA  "chromium/about_background.png"

+IDR_ABOUT_BACKGROUND_RTL           BINDATA  "chromium/about_background_rtl.png"

+IDR_PRODUCT_LOGO                   BINDATA  "chromium/product_logo.png"

+IDR_WIZARD_ICON                    BINDATA  "chromium/wizard_icon.png"

+IDR_WIZARD_ICON_RTL                BINDATA  "chromium/wizard_icon_rtl.png"

+#endif

diff --git a/chrome/app/theme/distributor_logo.png b/chrome/app/theme/distributor_logo.png
deleted file mode 100644
index ebe8ad0..0000000
--- a/chrome/app/theme/distributor_logo.png
+++ /dev/null
diff --git a/chrome/app/theme/distributor_logo_light.png b/chrome/app/theme/distributor_logo_light.png
deleted file mode 100644
index 8a2b067..0000000
--- a/chrome/app/theme/distributor_logo_light.png
+++ /dev/null
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/product_logo.png b/chrome/app/theme/product_logo.png
deleted file mode 100644
index 9d3c827..0000000
--- a/chrome/app/theme/product_logo.png
+++ /dev/null
diff --git a/chrome/app/theme/theme_dll.vcproj b/chrome/app/theme/theme_dll.vcproj
index 66c7925..a0e2bf9 100644
--- a/chrome/app/theme/theme_dll.vcproj
+++ b/chrome/app/theme/theme_dll.vcproj
@@ -148,7 +148,7 @@
 			>
 		</File>
 		<File
-			RelativePath="google_theme_resources.rc"
+			RelativePath="distribution_resources.rc"
 			>
 		</File>
 	</Files>
diff --git a/chrome/app/theme/theme_resources.rc b/chrome/app/theme/theme_resources.rc
index a55f83a..18b6cef 100644
--- a/chrome/app/theme/theme_resources.rc
+++ b/chrome/app/theme/theme_resources.rc
@@ -238,7 +238,6 @@ IDR_CONSTRAINED_TOP_CENTER_V         BINDATA  "constrained_top_center_v.png"
 IDR_CONSTRAINED_TOP_LEFT_CORNER_V    BINDATA  "constrained_top_left_corner_v.png"
 IDR_CONSTRAINED_TOP_RIGHT_CORNER_V   BINDATA  "constrained_top_right_corner_v.png"
 IDR_LOCATION_BAR_KEYWORD_HINT_TAB  BINDATA  "keyword_hint_tab.png"
-IDR_ABOUT_BACKGROUND               BINDATA  "about_background.png"
 IDR_SAD_FAVICON                    BINDATA  "sadfavicon.png"
 IDR_TAB_DROP_UP                    BINDATA  "tab_drop_up.png"
 IDR_TAB_DROP_DOWN                  BINDATA  "tab_drop_down.png"
@@ -258,15 +257,12 @@ IDR_INFO_BUBBLE_CORNER_TOP_LEFT    BINDATA  "bubble_corner_tl.png"
 IDR_INFO_BUBBLE_CORNER_TOP_RIGHT   BINDATA  "bubble_corner_tr.png"
 IDR_INFO_BUBBLE_CORNER_BOTTOM_LEFT   BINDATA  "bubble_corner_bl.png"
 IDR_INFO_BUBBLE_CORNER_BOTTOM_RIGHT  BINDATA  "bubble_corner_br.png"
-IDR_WIZARD_ICON                    BINDATA  "wizard_icon.png"
 IDR_MENU_MARKER                    BINDATA  "menu_marker.png"
 IDR_FROZEN_TAB_ICON                BINDATA "frozen_tab.png"
 IDR_FROZEN_PLUGIN_ICON             BINDATA "frozen_plugin.png"
 IDR_UPDATE_AVAILABLE               BINDATA "update_available.png"
 IDR_MENU_PAGE                      BINDATA "menu_page.png"
 IDR_MENU_CHROME                    BINDATA "menu_chrome.png"
-IDR_ABOUT_BACKGROUND_RTL           BINDATA "about_background_rtl.png"
-IDR_WIZARD_ICON_RTL                BINDATA "wizard_icon_rtl.png"
 IDR_LOCATIONBG_POPUPMODE_LEFT      BINDATA  "locationbg_readonly_left.png"
 IDR_LOCATIONBG_POPUPMODE_CENTER    BINDATA  "locationbg_readonly_center.png"
 IDR_LOCATIONBG_POPUPMODE_RIGHT     BINDATA  "locationbg_readonly_right.png"
@@ -305,4 +301,3 @@ IDR_FIND_DLG_RIGHT_BB_BACKGROUND   BINDATA  "find_dlg_right_bb_bg.png"
 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"
diff --git a/chrome/app/theme/wizard_icon.png b/chrome/app/theme/wizard_icon.png
deleted file mode 100644
index 36eca6f..0000000
--- a/chrome/app/theme/wizard_icon.png
+++ /dev/null
diff --git a/chrome/app/theme/wizard_icon_rtl.png b/chrome/app/theme/wizard_icon_rtl.png
deleted file mode 100644
index 10132b2..0000000
--- a/chrome/app/theme/wizard_icon_rtl.png
+++ /dev/null