diff options
author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-09 22:14:41 +0000 |
---|---|---|
committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-09 22:14:41 +0000 |
commit | 42ce38f4409a8a345563baa34559911a68b1cc33 (patch) | |
tree | a5b30d9418ad9ce1ae430c671fda33097995f845 | |
parent | b2f60e5741086ac4d52be40d6dbb6b228d208c9a (diff) | |
download | chromium_src-42ce38f4409a8a345563baa34559911a68b1cc33.zip chromium_src-42ce38f4409a8a345563baa34559911a68b1cc33.tar.gz chromium_src-42ce38f4409a8a345563baa34559911a68b1cc33.tar.bz2 |
Move favicon image files to ui/resources common folder
landing on behalf of newt: http://codereview.chromium.org/10989066/
TBR=newt@chromium.org
BUG=none
Review URL: https://codereview.chromium.org/11091026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160948 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | ui/resources/default_100_percent/common/default_favicon.png (renamed from ui/resources/default_100_percent/default_favicon.png) | bin | 1159 -> 1159 bytes | |||
-rw-r--r-- | ui/resources/default_100_percent/common/default_favicon_32.png (renamed from ui/resources/default_100_percent/default_favicon_32.png) | bin | 266 -> 266 bytes | |||
-rw-r--r-- | ui/resources/default_100_percent/common/default_favicon_64.png (renamed from ui/resources/default_100_percent/default_favicon_64.png) | bin | 1525 -> 1525 bytes | |||
-rw-r--r-- | ui/resources/default_200_percent/common/default_favicon.png (renamed from ui/resources/default_200_percent/default_favicon.png) | bin | 1256 -> 1256 bytes | |||
-rw-r--r-- | ui/resources/ui_resources.grd | 6 |
5 files changed, 3 insertions, 3 deletions
diff --git a/ui/resources/default_100_percent/default_favicon.png b/ui/resources/default_100_percent/common/default_favicon.png Binary files differindex bd9cf34..bd9cf34 100644 --- a/ui/resources/default_100_percent/default_favicon.png +++ b/ui/resources/default_100_percent/common/default_favicon.png diff --git a/ui/resources/default_100_percent/default_favicon_32.png b/ui/resources/default_100_percent/common/default_favicon_32.png Binary files differindex 01d205f..01d205f 100644 --- a/ui/resources/default_100_percent/default_favicon_32.png +++ b/ui/resources/default_100_percent/common/default_favicon_32.png diff --git a/ui/resources/default_100_percent/default_favicon_64.png b/ui/resources/default_100_percent/common/default_favicon_64.png Binary files differindex 3f6305c..3f6305c 100644 --- a/ui/resources/default_100_percent/default_favicon_64.png +++ b/ui/resources/default_100_percent/common/default_favicon_64.png diff --git a/ui/resources/default_200_percent/default_favicon.png b/ui/resources/default_200_percent/common/default_favicon.png Binary files differindex 2aa5df2..2aa5df2 100644 --- a/ui/resources/default_200_percent/default_favicon.png +++ b/ui/resources/default_200_percent/common/default_favicon.png diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd index 7cff645..7992e8d 100644 --- a/ui/resources/ui_resources.grd +++ b/ui/resources/ui_resources.grd @@ -92,9 +92,9 @@ <structure type="chrome_scaled_image" name="IDR_CONTENT_BOTTOM_RIGHT_CORNER" file="content_bottom_right_corner.png" /> <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_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_DEFAULT_FAVICON" file="common/default_favicon.png" /> + <structure type="chrome_scaled_image" name="IDR_DEFAULT_FAVICON_32" file="common/default_favicon_32.png" /> + <structure type="chrome_scaled_image" name="IDR_DEFAULT_FAVICON_64" file="common/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" /> |