diff options
| author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-17 09:37:41 +0000 |
|---|---|---|
| committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-17 09:37:41 +0000 |
| commit | 0d18ee21d5ddbfecf3951ac8fc0f5a30465e0ffe (patch) | |
| tree | e4d26fea5096dbf0c3cd2a32fdd1eee5b3425e1a /chrome/app/theme | |
| parent | 0aadb2730502c211f4da5366ccf4be30aedaa364 (diff) | |
| download | chromium_src-0d18ee21d5ddbfecf3951ac8fc0f5a30465e0ffe.zip chromium_src-0d18ee21d5ddbfecf3951ac8fc0f5a30465e0ffe.tar.gz chromium_src-0d18ee21d5ddbfecf3951ac8fc0f5a30465e0ffe.tar.bz2 | |
Update the icons for the upgrade notification and the conflicts detected page.
Since we no longer pulsate the notification dot I've also removed the animation.
BUG=http://crbug.com/51105, http://crbug.com/27941
TEST=None
Review URL: http://codereview.chromium.org/5056004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66412 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/theme')
| -rw-r--r-- | chrome/app/theme/conflicts.png | bin | 801 -> 0 bytes | |||
| -rw-r--r-- | chrome/app/theme/theme_resources.grd | 7 |
2 files changed, 6 insertions, 1 deletions
diff --git a/chrome/app/theme/conflicts.png b/chrome/app/theme/conflicts.png Binary files differdeleted file mode 100644 index 6149c8e..0000000 --- a/chrome/app/theme/conflicts.png +++ /dev/null diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd index ce8b295..cfbc868 100644 --- a/chrome/app/theme/theme_resources.grd +++ b/chrome/app/theme/theme_resources.grd @@ -24,6 +24,8 @@ <include name="IDR_ACCESSED_COOKIES" file="accessed_cookies.png" type="BINDATA" /> <include name="IDR_APP_DEFAULT_ICON" file="app_default_icon.png" type="BINDATA" /> <include name="IDR_APP_DROPARROW" file="app_droparrow.png" type="BINDATA" /> + <include name="IDR_BACKGROUND_BADGE" file="background_badge.png" type="BINDATA" /> + <include name="IDR_BACKGROUND_MENU" file="background_menu.png" type="BINDATA" /> <include name="IDR_BACK" file="back.png" type="BINDATA" /> <include name="IDR_BACK_D" file="back_d.png" type="BINDATA" /> <include name="IDR_BACK_H" file="back_h.png" type="BINDATA" /> @@ -77,7 +79,8 @@ <include name="IDR_CLOSE_BAR_P" file="close_bar_p.png" type="BINDATA" /> <include name="IDR_CLOSE_BUTTON_MASK" file="close_button_mask.png" type="BINDATA" /> <if expr="os.find('win') != -1"> - <include name="IDR_CONFLICTS" file="conflicts.png" type="BINDATA" /> + <include name="IDR_CONFLICT_BADGE" file="conflict_badge.png" type="BINDATA" /> + <include name="IDR_CONFLICT_MENU" file="conflict_menu.png" type="BINDATA" /> </if> <include name="IDR_CONSTRAINED_BOTTOM_CENTER_V" file="constrained_bottom_center_v.png" type="BINDATA" /> <include name="IDR_CONSTRAINED_BOTTOM_LEFT_CORNER_V" file="constrained_bottom_left_corner_v.png" type="BINDATA" /> @@ -426,7 +429,9 @@ <include name="IDR_TOOLS_H" file="tools_h.png" type="BINDATA" /> <include name="IDR_TOOLS_P" file="tools_p.png" type="BINDATA" /> <include name="IDR_UPDATE_AVAILABLE" file="update_available.png" type="BINDATA" /> + <include name="IDR_UPDATE_BADGE" file="update_badge.png" type="BINDATA" /> <include name="IDR_UPDATE_FAIL" file="update_fail.png" type="BINDATA" /> + <include name="IDR_UPDATE_MENU" file="update_menu.png" type="BINDATA" /> <include name="IDR_UPDATE_UPTODATE" file="update_uptodate.png" type="BINDATA" /> <include name="IDR_UPGRADE_DOT_ACTIVE" file="upgrade_dot_active.png" type="BINDATA" /> <include name="IDR_UPGRADE_DOT_INACTIVE" file="upgrade_dot_inactive.png" type="BINDATA" /> |
