summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authornoms@chromium.org <noms@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-22 22:21:18 +0000
committernoms@chromium.org <noms@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-22 22:21:18 +0000
commit147f995bb250814faca7cd1a4334569bf0847289 (patch)
tree536fe3187b53bfd50b45a1daaa2d8d8e98d0f809 /chrome/app
parent99a4f7afd86a1836f4ed46db3aab348d97046486 (diff)
downloadchromium_src-147f995bb250814faca7cd1a4334569bf0847289.zip
chromium_src-147f995bb250814faca7cd1a4334569bf0847289.tar.gz
chromium_src-147f995bb250814faca7cd1a4334569bf0847289.tar.bz2
[Win] Fix the 'edit profile' button in the avatar bubble.
- use the correct icon in the avatar bubble, which only shows up on hover - add 2 new kinds of icon placements (ICON_FLUSH_RIGHT, ICON_FLUSH_LEFT) to TextButton so that a button can have both an icon and span a fixed width. Screenshots for the new ICON_FLUSH_X icon placement options: https://drive.google.com/a/chromium.org/folderview?id=0B1B1Up4p2NRMYXF5cXdFQU5hODA&usp=sharing BUG=325435 TEST=Start Chrome with the --new-profile-management flag enabled. In the avatar bubble, hover over the profile name. The pencil icon should appear. Review URL: https://codereview.chromium.org/137073002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246436 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/theme/theme_resources.grd3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index 91a5be2..1cb4b4b 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -323,6 +323,9 @@
<structure type="chrome_scaled_image" name="IDR_ICON_PROFILES_BROWSE_GUEST" file="common/icon_browse_as_guest.png" />
<structure type="chrome_scaled_image" name="IDR_ICON_PROFILES_BROWSE_GUEST_WHITE" file="common/icon_browse_as_guest_white.png" />
<structure type="chrome_scaled_image" name="IDR_ICON_PROFILES_LOCKED" file="common/icon_locked.png" />
+ <structure type="chrome_scaled_image"
+ name="IDR_ICON_PROFILES_EDIT_HOVER" file="common/edit_button_hover.png" />
+ <structure type="chrome_scaled_image" name="IDR_ICON_PROFILES_EDIT_PRESSED" file="common/edit_button_pressed.png" />
</if>
<if expr="not is_android and not is_ios and not pp_ifdef('chromeos')">
<!-- TODO(noms): Remove this once local profile avatars are migrated -->