summaryrefslogtreecommitdiffstats
path: root/ui/resources
diff options
context:
space:
mode:
authornewt@chromium.org <newt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-27 00:14:05 +0000
committernewt@chromium.org <newt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-27 00:14:05 +0000
commit81883b02ff945ba4c289d94390bbcc6b236152d7 (patch)
tree8a04b4ed2461dc02c5816621f2158b3f1e9c65a8 /ui/resources
parent5cdd503e59f77c8c9e4786d6e6fac244d15c56a4 (diff)
downloadchromium_src-81883b02ff945ba4c289d94390bbcc6b236152d7.zip
chromium_src-81883b02ff945ba4c289d94390bbcc6b236152d7.tar.gz
chromium_src-81883b02ff945ba4c289d94390bbcc6b236152d7.tar.bz2
Support 64x64 favicons on Android.
On Android we show bookmarks using 64x64 favicons. BUG=145783 Review URL: https://chromiumcodereview.appspot.com/10919025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158941 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/resources')
-rw-r--r--ui/resources/default_100_percent/default_large_favicon.pngbin266 -> 0 bytes
-rw-r--r--ui/resources/ui_resources.grd3
2 files changed, 2 insertions, 1 deletions
diff --git a/ui/resources/default_100_percent/default_large_favicon.png b/ui/resources/default_100_percent/default_large_favicon.png
deleted file mode 100644
index 01d205f..0000000
--- a/ui/resources/default_100_percent/default_large_favicon.png
+++ /dev/null
Binary files differ
diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd
index 102c9610..7cff645 100644
--- a/ui/resources/ui_resources.grd
+++ b/ui/resources/ui_resources.grd
@@ -93,7 +93,8 @@
<structure type="chrome_scaled_image" name="IDR_CONTENT_LEFT_SIDE" file="content_left_side.png" />
<structure type="chrome_scaled_image" name="IDR_CONTENT_RIGHT_SIDE" file="content_right_side.png" />
<structure type="chrome_scaled_image" name="IDR_DEFAULT_FAVICON" file="default_favicon.png" />
- <structure type="chrome_scaled_image" name="IDR_DEFAULT_LARGE_FAVICON" file="default_large_favicon.png" />
+ <structure type="chrome_scaled_image" name="IDR_DEFAULT_FAVICON_32" file="default_favicon_32.png" />
+ <structure type="chrome_scaled_image" name="IDR_DEFAULT_FAVICON_64" file="default_favicon_64.png" />
<structure type="chrome_scaled_image" name="IDR_FOLDER_CLOSED" file="common/folder_closed.png" />
<structure type="chrome_scaled_image" name="IDR_FOLDER_CLOSED_RTL" file="common/folder_closed_rtl.png" />
<structure type="chrome_scaled_image" name="IDR_FOLDER_OPEN" file="common/folder_open.png" />