diff options
| author | noms <noms@chromium.org> | 2014-09-29 14:00:42 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-29 21:00:53 +0000 |
| commit | c86c1fcf7beec49a7b362208da99904e5aee13fd (patch) | |
| tree | 300b452f9c100c83649d62967d2d6a0f71a0a14a /chrome/app/theme | |
| parent | 4c1d1ef9c811b58e83bff3e9cd8012d801bfa88b (diff) | |
| download | chromium_src-c86c1fcf7beec49a7b362208da99904e5aee13fd.zip chromium_src-c86c1fcf7beec49a7b362208da99904e5aee13fd.tar.gz chromium_src-c86c1fcf7beec49a7b362208da99904e5aee13fd.tar.bz2 | |
[Mac] Redesign the new avatar button.
Screenshots: https://drive.google.com/open?id=0B1B1Up4p2NRMRXpYbGJ6emtlX0U&authuser=1
TL; DR:
- never show a drop down arrow in the button.
- this means that we no longer need to do the auth error drawing magic, as we can use the
button's image. Also cleaned up ALL of that insane code.
- if there is one local, non-signed in profile, show a tiny button with a generic avatar
- in all other cases, show the avatar button with the profile name
- increased the button height by 1px so that it's perfectly aligned with the new tab button
BUG=410946
Review URL: https://codereview.chromium.org/605803002
Cr-Commit-Position: refs/heads/master@{#297255}
Diffstat (limited to 'chrome/app/theme')
| -rw-r--r-- | chrome/app/theme/default_100_percent/mac/avatar_button/sign_in_button_arrow.png | bin | 117 -> 0 bytes | |||
| -rw-r--r-- | chrome/app/theme/default_100_percent/mac/avatar_button/sign_in_button_arrow_hover.png | bin | 115 -> 0 bytes | |||
| -rw-r--r-- | chrome/app/theme/default_100_percent/mac/avatar_button/sign_in_button_arrow_pressed.png | bin | 115 -> 0 bytes | |||
| -rw-r--r-- | chrome/app/theme/default_200_percent/mac/avatar_button/sign_in_button_arrow.png | bin | 257 -> 0 bytes | |||
| -rw-r--r-- | chrome/app/theme/default_200_percent/mac/avatar_button/sign_in_button_arrow_hover.png | bin | 241 -> 0 bytes | |||
| -rw-r--r-- | chrome/app/theme/default_200_percent/mac/avatar_button/sign_in_button_arrow_pressed.png | bin | 241 -> 0 bytes | |||
| -rw-r--r-- | chrome/app/theme/theme_resources.grd | 6 |
7 files changed, 3 insertions, 3 deletions
diff --git a/chrome/app/theme/default_100_percent/mac/avatar_button/sign_in_button_arrow.png b/chrome/app/theme/default_100_percent/mac/avatar_button/sign_in_button_arrow.png Binary files differdeleted file mode 100644 index bd21bccc..0000000 --- a/chrome/app/theme/default_100_percent/mac/avatar_button/sign_in_button_arrow.png +++ /dev/null diff --git a/chrome/app/theme/default_100_percent/mac/avatar_button/sign_in_button_arrow_hover.png b/chrome/app/theme/default_100_percent/mac/avatar_button/sign_in_button_arrow_hover.png Binary files differdeleted file mode 100644 index de93ace..0000000 --- a/chrome/app/theme/default_100_percent/mac/avatar_button/sign_in_button_arrow_hover.png +++ /dev/null diff --git a/chrome/app/theme/default_100_percent/mac/avatar_button/sign_in_button_arrow_pressed.png b/chrome/app/theme/default_100_percent/mac/avatar_button/sign_in_button_arrow_pressed.png Binary files differdeleted file mode 100644 index de93ace..0000000 --- a/chrome/app/theme/default_100_percent/mac/avatar_button/sign_in_button_arrow_pressed.png +++ /dev/null diff --git a/chrome/app/theme/default_200_percent/mac/avatar_button/sign_in_button_arrow.png b/chrome/app/theme/default_200_percent/mac/avatar_button/sign_in_button_arrow.png Binary files differdeleted file mode 100644 index 85f53eb..0000000 --- a/chrome/app/theme/default_200_percent/mac/avatar_button/sign_in_button_arrow.png +++ /dev/null diff --git a/chrome/app/theme/default_200_percent/mac/avatar_button/sign_in_button_arrow_hover.png b/chrome/app/theme/default_200_percent/mac/avatar_button/sign_in_button_arrow_hover.png Binary files differdeleted file mode 100644 index faa4410..0000000 --- a/chrome/app/theme/default_200_percent/mac/avatar_button/sign_in_button_arrow_hover.png +++ /dev/null diff --git a/chrome/app/theme/default_200_percent/mac/avatar_button/sign_in_button_arrow_pressed.png b/chrome/app/theme/default_200_percent/mac/avatar_button/sign_in_button_arrow_pressed.png Binary files differdeleted file mode 100644 index b080c3a..0000000 --- a/chrome/app/theme/default_200_percent/mac/avatar_button/sign_in_button_arrow_pressed.png +++ /dev/null diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd index 560098a..359446a 100644 --- a/chrome/app/theme/theme_resources.grd +++ b/chrome/app/theme/theme_resources.grd @@ -772,9 +772,9 @@ </if> <!-- toolkit_views --> <if expr="is_macosx"> <!-- Mac --> - <structure type="chrome_scaled_image" name="IDR_AVATAR_MAC_BUTTON_DROPARROW" file="mac/avatar_button/sign_in_button_arrow.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_MAC_BUTTON_DROPARROW_HOVER" file="mac/avatar_button/sign_in_button_arrow_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_MAC_BUTTON_DROPARROW_PRESSED" file="mac/avatar_button/sign_in_button_arrow_pressed.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_MAC_BUTTON_AVATAR" file="mac/avatar_button/sign_in_button_avatar.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_MAC_BUTTON_AVATAR_HOVER" file="mac/avatar_button/sign_in_button_avatar_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_MAC_BUTTON_AVATAR_PRESSED" file="mac/avatar_button/sign_in_button_avatar_pressed.png" /> <structure type="chrome_scaled_image" name="IDR_AVATAR_MAC_BUTTON_NORMAL_BOTTOM" file="mac/avatar_button/sign_in_button_bottom.png" /> <structure type="chrome_scaled_image" name="IDR_AVATAR_MAC_BUTTON_NORMAL_BOTTOM_LEFT" file="mac/avatar_button/sign_in_button_bottom_left.png" /> <structure type="chrome_scaled_image" name="IDR_AVATAR_MAC_BUTTON_NORMAL_BOTTOM_RIGHT" file="mac/avatar_button/sign_in_button_bottom_right.png" /> |
