Commit beea8094 authored by newt@chromium.org's avatar newt@chromium.org

[Android] Update infobar assets.

This deletes some assets that are now unused:
 - infobar_button_*
 - infobar_shadow
 - infobar_update_uma (not used in Chromium)

Updates some infobar icons with pretty new blue versions:
 - infobar_microphone
 - infobar_protected_media_identifier

And deletes icons for infobars that never appear on Android:
 - infobar_theme
 - infobar_cookie
 - infobar_desktop_notifications
 - infobar_didyoumean
 - infobar_plugin
 - infobar_plugin_crashed
 - infobar_restore

This also renames infobar_autofill.png to infobar_autofill_cc.png since
it always refers to credit card-related autofill.

R=dfalcantara@chromium.org, dtrainor@chromium.org, estade@chromium.org, oshima@chromium.org
TBR=oshima@chromium.org
BUG=375379
BUG=386359

Review URL: https://codereview.chromium.org/383123008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282752 0039d316-1c4b-4281-b951-d872f2087c98
parent 7d3cfa86
......@@ -405,7 +405,7 @@
</if>
<structure type="chrome_scaled_image" name="IDR_INFOBAR_3D_BLOCKED" file="common/infobar_3d_blocked.png" />
<structure type="chrome_scaled_image" name="IDR_INFOBAR_ALT_NAV_URL" file="common/infobar_alt_nav_url.png" />
<structure type="chrome_scaled_image" name="IDR_INFOBAR_AUTOFILL" file="common/infobar_autofill.png" />
<structure type="chrome_scaled_image" name="IDR_INFOBAR_AUTOFILL_CC" file="common/infobar_autofill_cc.png" />
<structure type="chrome_scaled_image" name="IDR_INFOBAR_AUTOLOGIN" file="common/infobar_autologin.png" />
<structure type="chrome_scaled_image" name="IDR_INFOBAR_COOKIE" file="common/infobar_cookie.png" />
<structure type="chrome_scaled_image" name="IDR_INFOBAR_DESKTOP_NOTIFICATIONS" file="common/infobar_desktop_notifications.png" />
......
......@@ -14,29 +14,20 @@
DEFINE_RESOURCE_ID(0, 0)
// InfoBar resources.
DEFINE_RESOURCE_ID(IDR_INFOBAR_ALT_NAV_URL, R.drawable.infobar_didyoumean)
DEFINE_RESOURCE_ID(IDR_INFOBAR_AUTOFILL, R.drawable.infobar_autofill)
DEFINE_RESOURCE_ID(IDR_INFOBAR_AUTOFILL_CC, R.drawable.infobar_autofill_cc)
DEFINE_RESOURCE_ID(IDR_INFOBAR_AUTOLOGIN,\
R.drawable.infobar_savepassword_autologin)
DEFINE_RESOURCE_ID(IDR_INFOBAR_COOKIE, R.drawable.infobar_cookie)
DEFINE_RESOURCE_ID(IDR_INFOBAR_DESKTOP_NOTIFICATIONS,\
R.drawable.infobar_desktop_notifications)
DEFINE_RESOURCE_ID(IDR_INFOBAR_GEOLOCATION, R.drawable.infobar_geolocation)
DEFINE_RESOURCE_ID(IDR_INFOBAR_MEDIA_STREAM_CAMERA, R.drawable.infobar_camera)
DEFINE_RESOURCE_ID(IDR_INFOBAR_MEDIA_STREAM_MIC, R.drawable.infobar_microphone)
DEFINE_RESOURCE_ID(IDR_INFOBAR_MIDI, R.drawable.infobar_midi)
DEFINE_RESOURCE_ID(IDR_INFOBAR_MULTIPLE_DOWNLOADS,\
R.drawable.infobar_multiple_downloads)
DEFINE_RESOURCE_ID(IDR_INFOBAR_PLUGIN_CRASHED,\
R.drawable.infobar_plugin_crashed)
DEFINE_RESOURCE_ID(IDR_INFOBAR_PLUGIN_INSTALL, R.drawable.infobar_plugin)
DEFINE_RESOURCE_ID(IDR_INFOBAR_PROTECTED_MEDIA_IDENTIFIER,
R.drawable.infobar_protected_media_identifier)
DEFINE_RESOURCE_ID(IDR_INFOBAR_RESTORE_SESSION, R.drawable.infobar_restore)
DEFINE_RESOURCE_ID(IDR_INFOBAR_SAVE_PASSWORD,\
R.drawable.infobar_savepassword_autologin)
DEFINE_RESOURCE_ID(IDR_INFOBAR_WARNING, R.drawable.infobar_warning)
DEFINE_RESOURCE_ID(IDR_INFOBAR_THEME, R.drawable.infobar_theme)
DEFINE_RESOURCE_ID(IDR_INFOBAR_TRANSLATE, R.drawable.infobar_translate)
DEFINE_RESOURCE_ID(IDR_BLOCKED_POPUPS, R.drawable.infobar_blocked_popups)
......
......@@ -58,7 +58,7 @@ void AutofillCCInfoBarDelegate::InfoBarDismissed() {
}
int AutofillCCInfoBarDelegate::GetIconID() const {
return IDR_INFOBAR_AUTOFILL;
return IDR_INFOBAR_AUTOFILL_CC;
}
infobars::InfoBarDelegate::Type AutofillCCInfoBarDelegate::GetInfoBarType()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment