diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-03 18:38:47 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-03 18:38:47 +0000 |
| commit | 7b2c94094c8890c5ca9bf3c3da629a4db7c660dd (patch) | |
| tree | c6b8898e53365fb67ead196e9712a2b3b6abf0ef /ui/resources | |
| parent | b7e00d4491f40e91f53936cf797791f8585bae80 (diff) | |
| download | chromium_src-7b2c94094c8890c5ca9bf3c3da629a4db7c660dd.zip chromium_src-7b2c94094c8890c5ca9bf3c3da629a4db7c660dd.tar.gz chromium_src-7b2c94094c8890c5ca9bf3c3da629a4db7c660dd.tar.bz2 | |
Merge 144313 - mac: Remove nav.pdf in favor of IDR_DEFAULT_FAVICON.
Copy default_100/default_large_favicon.png to default_200/default_favicon.png
BUG=111101
TEST=Favicons on bookmark bar, in history menu, etc still look good
in both lodpi and hidpi.
TBR=sky
Review URL: https://chromiumcodereview.appspot.com/10662041
TBR=thakis@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/branches/1180/src@145338 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/resources')
| -rw-r--r-- | ui/resources/default_200_percent/default_favicon.png | bin | 0 -> 2836 bytes | |||
| -rw-r--r-- | ui/resources/ui_resources.grd | 1 | ||||
| -rw-r--r-- | ui/resources/ui_resources_standard.grd | 1 |
3 files changed, 1 insertions, 1 deletions
diff --git a/ui/resources/default_200_percent/default_favicon.png b/ui/resources/default_200_percent/default_favicon.png Binary files differnew file mode 100644 index 0000000..da4ee65 --- /dev/null +++ b/ui/resources/default_200_percent/default_favicon.png diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd index 6d3ccce..e9a2586 100644 --- a/ui/resources/ui_resources.grd +++ b/ui/resources/ui_resources.grd @@ -29,7 +29,6 @@ <include name="IDR_CONTENT_BOTTOM_RIGHT_CORNER" file="default_100_percent/content_bottom_right_corner.png" type="BINDATA" /> <include name="IDR_CONTENT_LEFT_SIDE" file="default_100_percent/content_left_side.png" type="BINDATA" /> <include name="IDR_CONTENT_RIGHT_SIDE" file="default_100_percent/content_right_side.png" type="BINDATA" /> - <include name="IDR_DEFAULT_FAVICON" file="default_100_percent/default_favicon.png" type="BINDATA" /> <include name="IDR_DEFAULT_LARGE_FAVICON" file="default_100_percent/default_large_favicon.png" type="BINDATA" /> <include name="IDR_FOLDER_CLOSED" file="default_100_percent/folder_closed.png" type="BINDATA" /> <include name="IDR_FOLDER_CLOSED_RTL" file="default_100_percent/folder_closed_rtl.png" type="BINDATA" /> diff --git a/ui/resources/ui_resources_standard.grd b/ui/resources/ui_resources_standard.grd index 633f98d..f643f4a 100644 --- a/ui/resources/ui_resources_standard.grd +++ b/ui/resources/ui_resources_standard.grd @@ -44,6 +44,7 @@ <structure type="chrome_scaled_image" name="IDR_CLOSE_BAR_H" file="close_bar_hover.png" /> <structure type="chrome_scaled_image" name="IDR_CLOSE_BAR_MASK" file="close_bar_mask.png" /> <structure type="chrome_scaled_image" name="IDR_CLOSE_BAR_P" file="close_bar_pressed.png" /> + <structure type="chrome_scaled_image" name="IDR_DEFAULT_FAVICON" file="default_favicon.png" /> <structure type="chrome_scaled_image" name="IDR_THROBBER" file="throbber.png" /> <!-- Remaining images only used by Aura. --> |
