summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-04 18:12:15 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-04 18:12:15 +0000
commitd347cff66b930ecc034d8a7688674bf517cd5c06 (patch)
tree609659ed575eb441ea6d78d0964cd7cdb750c789 /chrome/app
parent7cb77fff260e91e24a8bc53159eaa78e2e907eeb (diff)
downloadchromium_src-d347cff66b930ecc034d8a7688674bf517cd5c06.zip
chromium_src-d347cff66b930ecc034d8a7688674bf517cd5c06.tar.gz
chromium_src-d347cff66b930ecc034d8a7688674bf517cd5c06.tar.bz2
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
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/theme/chromium/product_logo_16.pngbin725 -> 0 bytes
-rw-r--r--chrome/app/theme/chromium/product_logo_26.pngbin1614 -> 0 bytes
-rw-r--r--chrome/app/theme/chromium/product_logo_32.pngbin1880 -> 0 bytes
-rw-r--r--chrome/app/theme/theme_resources.grd6
-rw-r--r--chrome/app/theme/theme_resources_standard.grd6
5 files changed, 6 insertions, 6 deletions
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
--- a/chrome/app/theme/chromium/product_logo_16.png
+++ /dev/null
Binary files 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
--- a/chrome/app/theme/chromium/product_logo_26.png
+++ /dev/null
Binary files 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
--- a/chrome/app/theme/chromium/product_logo_32.png
+++ /dev/null
Binary files 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" />