From d347cff66b930ecc034d8a7688674bf517cd5c06 Mon Sep 17 00:00:00 2001
From: "thakis@chromium.org"
 <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 4 Jul 2012 18:12:15 +0000
Subject: HiDPI assets for product_logo_16 / _32

Use the new logo on about:chrome

BUG=134372,135179
TEST=none

Review URL: https://chromiumcodereview.appspot.com/10692069

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145475 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/app/theme/chromium/product_logo_16.png | Bin 725 -> 0 bytes
 chrome/app/theme/chromium/product_logo_26.png | Bin 1614 -> 0 bytes
 chrome/app/theme/chromium/product_logo_32.png | Bin 1880 -> 0 bytes
 chrome/app/theme/theme_resources.grd          |   6 ------
 chrome/app/theme/theme_resources_standard.grd |   6 ++++++
 5 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 100644 chrome/app/theme/chromium/product_logo_16.png
 delete mode 100644 chrome/app/theme/chromium/product_logo_26.png
 delete mode 100644 chrome/app/theme/chromium/product_logo_32.png

(limited to 'chrome/app')

diff --git a/chrome/app/theme/chromium/product_logo_16.png b/chrome/app/theme/chromium/product_logo_16.png
deleted file mode 100644
index c9f8c26..0000000
Binary files a/chrome/app/theme/chromium/product_logo_16.png and /dev/null differ
diff --git a/chrome/app/theme/chromium/product_logo_26.png b/chrome/app/theme/chromium/product_logo_26.png
deleted file mode 100644
index 64c5c0c..0000000
Binary files a/chrome/app/theme/chromium/product_logo_26.png and /dev/null differ
diff --git a/chrome/app/theme/chromium/product_logo_32.png b/chrome/app/theme/chromium/product_logo_32.png
deleted file mode 100644
index 8e531c8..0000000
Binary files a/chrome/app/theme/chromium/product_logo_32.png and /dev/null differ
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index 0ac925c..8d61140 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -130,16 +130,10 @@
       <include name="IDR_PRERENDER_FAIL_ICON" file="default_100_percent/prerender_fail_icon.png" type="BINDATA"/>
       <include name="IDR_PRERENDER_SUCCEED_ICON" file="default_100_percent/prerender_succeed_icon.png" type="BINDATA"/>
       <if expr="pp_ifdef('_google_chrome')">
-        <include name="IDR_PRODUCT_LOGO_16" file="google_chrome/product_logo_16.png" type="BINDATA" />
-        <include name="IDR_PRODUCT_LOGO_26" file="google_chrome/product_logo_26.png" type="BINDATA" />
-        <include name="IDR_PRODUCT_LOGO_32" file="google_chrome/product_logo_32.png" type="BINDATA" />
         <include name="IDR_PRODUCT_LOGO_64" file="google_chrome/product_logo_64.png" type="BINDATA" />
         <include name="IDR_PRODUCT_LOGO_128" file="google_chrome/product_logo_128.png" type="BINDATA" />
       </if>
       <if expr="not pp_ifdef('_google_chrome')">
-        <include name="IDR_PRODUCT_LOGO_16" file="chromium/product_logo_16.png" type="BINDATA" />
-        <include name="IDR_PRODUCT_LOGO_26" file="chromium/product_logo_26.png" type="BINDATA" />
-        <include name="IDR_PRODUCT_LOGO_32" file="chromium/product_logo_32.png" type="BINDATA" />
         <include name="IDR_PRODUCT_LOGO_64" file="chromium/product_logo_64.png" type="BINDATA" />
         <include name="IDR_PRODUCT_LOGO_128" file="chromium/product_logo_128.png" type="BINDATA" />
       </if>
diff --git a/chrome/app/theme/theme_resources_standard.grd b/chrome/app/theme/theme_resources_standard.grd
index 957265a..1f73ffa 100644
--- a/chrome/app/theme/theme_resources_standard.grd
+++ b/chrome/app/theme/theme_resources_standard.grd
@@ -278,10 +278,16 @@
       <if expr="pp_ifdef('_google_chrome')">
         <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO" file="google_chrome/product_logo.png" />
         <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_WHITE" file="google_chrome/product_logo_white.png" />
+        <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="google_chrome/product_logo_16.png" />
+        <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_26" file="google_chrome/product_logo_26.png" />
+        <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="google_chrome/product_logo_32.png" />
       </if>
       <if expr="not pp_ifdef('_google_chrome')">
         <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO" file="chromium/product_logo.png" />
         <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_WHITE" file="chromium/product_logo_white.png" />
+        <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="chromium/product_logo_16.png" />
+        <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_26" file="chromium/product_logo_26.png" />
+        <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="chromium/product_logo_32.png" />
       </if>
       <if expr="not is_macosx">
         <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_0" file="profile_avatar_generic.png" />
-- 
cgit v1.1