summaryrefslogtreecommitdiffstats
path: root/chrome/app/theme/theme_resources.grd
diff options
context:
space:
mode:
authormkwst@chromium.org <mkwst@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-11 09:03:34 +0000
committermkwst@chromium.org <mkwst@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-11 09:03:34 +0000
commit39043bcd80d418b4ecd63de46e882f8605286e1b (patch)
tree263b02dc42b934eb621a4a406557c3a00f452444 /chrome/app/theme/theme_resources.grd
parent600eaf4e37add2a5b8448c0fd9c569b354d39f90 (diff)
downloadchromium_src-39043bcd80d418b4ecd63de46e882f8605286e1b.zip
chromium_src-39043bcd80d418b4ecd63de46e882f8605286e1b.tar.gz
chromium_src-39043bcd80d418b4ecd63de46e882f8605286e1b.tar.bz2
Password bubble: Add an "active" icon state, and a new disabled icon.
------------------------------------------------------------------------ This is a re-land of r276284, which was reverted due to test breakage. The original review is https://codereview.chromium.org/324853004/ ------------------------------------------------------------------------ BUG=261628 TBR=oshima@chromium.org, vabr@chromium.org Review URL: https://codereview.chromium.org/322253006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276311 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/theme/theme_resources.grd')
-rw-r--r--chrome/app/theme/theme_resources.grd6
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index 7bb6672..afc3fc2 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -107,8 +107,6 @@
<structure type="chrome_scaled_image" name="IDR_BLOCKED_JAVASCRIPT" file="common/blocked_script.png" />
<structure type="chrome_scaled_image" name="IDR_BLOCKED_LOCATION" file="common/blocked_location.png" />
<structure type="chrome_scaled_image" name="IDR_BLOCKED_MEDIA" file="common/blocked_media.png" />
- <structure type="chrome_scaled_image" name="IDR_SAVE_PASSWORD" file="common/save_password.png" />
- <structure type="chrome_scaled_image" name="IDR_SAVE_PASSWORD_BLACKLISTED" file="common/blocked_save_passwords.png" />
<structure type="chrome_scaled_image" name="IDR_BLOCKED_MIDI_SYSEX" file="common/blocked_midi.png" />
<structure type="chrome_scaled_image" name="IDR_BLOCKED_MOUSE_CURSOR" file="common/blocked_mouse_cursor.png" />
<structure type="chrome_scaled_image" name="IDR_BLOCKED_MIXED_CONTENT" file="common/blocked_mixed_content.png" />
@@ -890,6 +888,10 @@
<structure type="chrome_scaled_image" name="IDR_SAD_FAVICON" file="common/favicon_sad_tab.png" />
<structure type="chrome_scaled_image" name="IDR_SAD_TAB" file="common/sadtab.png" />
<structure type="chrome_scaled_image" name="IDR_SAFEBROWSING_WARNING" file="common/safebrowsing_warning.png" />
+ <structure type="chrome_scaled_image" name="IDR_SAVE_PASSWORD_ACTIVE" file="common/save_password_active.png" />
+ <structure type="chrome_scaled_image" name="IDR_SAVE_PASSWORD_DISABLED_ACTIVE" file="common/save_password_disabled_active.png" />
+ <structure type="chrome_scaled_image" name="IDR_SAVE_PASSWORD_DISABLED_INACTIVE" file="common/save_password_disabled_inactive.png" />
+ <structure type="chrome_scaled_image" name="IDR_SAVE_PASSWORD_INACTIVE" file="common/save_password_inactive.png" />
<structure type="chrome_scaled_image" name="IDR_SCREEN_CAPTURE_NOTIFICATION_GRIP" file="screen_capture_notification_grip.png" />
<structure type="chrome_scaled_image" name="IDR_SCREENSHOT_NOTIFICATION_ICON" file="common/notification_screenshot_icon.png" />
<if expr="chromeos">