Commit 6d3df05b authored by thakis@chromium.org's avatar thakis@chromium.org

Use mac browser action overflow asset on all platforms

Hot on the heels of r175591, we're now using the centered
asset everywhere.

This moves the mac asset over to common, removes the one in the
root directory (which was used by gtk), and updates the grd file.

BUG=168897
TEST=look at browser actions overflow asset, it's vertically centered.
on all platforms.
TBR=sail

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175612 0039d316-1c4b-4281-b951-d872f2087c98
parent 91e31ac6
......@@ -108,25 +108,15 @@
<structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION" file="browser_action.png" />
<structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION_H" file="browser_action_hover.png" />
<structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION_P" file="browser_action_pressed.png" />
<structure type="chrome_scaled_image" name="IDR_BROWSER_ACTIONS_OVERFLOW" file="browser_actions_overflow.png" />
<structure type="chrome_scaled_image" name="IDR_BROWSER_ACTIONS_OVERFLOW_H" file="browser_actions_overflow_hover.png" />
<structure type="chrome_scaled_image" name="IDR_BROWSER_ACTIONS_OVERFLOW_P" file="browser_actions_overflow_pressed.png" />
</if>
<if expr="pp_ifdef('toolkit_views') or is_macosx">
<structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION" file="common/browser_action_normal.png" />
<structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION_H" file="common/browser_action_hover.png" />
<structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION_P" file="common/browser_action_pressed.png" />
</if>
<if expr="pp_ifdef('toolkit_views')">
<structure type="chrome_scaled_image" name="IDR_BROWSER_ACTIONS_OVERFLOW" file="common/browser_actions_overflow_normal.png" />
<structure type="chrome_scaled_image" name="IDR_BROWSER_ACTIONS_OVERFLOW_H" file="common/browser_actions_overflow_hover.png" />
<structure type="chrome_scaled_image" name="IDR_BROWSER_ACTIONS_OVERFLOW_P" file="common/browser_actions_overflow_pressed.png" />
</if>
<if expr="is_macosx">
<structure type="chrome_scaled_image" name="IDR_BROWSER_ACTIONS_OVERFLOW" file="mac/browser_actions_overflow_normal.png" />
<structure type="chrome_scaled_image" name="IDR_BROWSER_ACTIONS_OVERFLOW_H" file="mac/browser_actions_overflow_hover.png" />
<structure type="chrome_scaled_image" name="IDR_BROWSER_ACTIONS_OVERFLOW_P" file="mac/browser_actions_overflow_pressed.png" />
</if>
<structure type="chrome_scaled_image" name="IDR_BROWSER_ACTIONS_OVERFLOW" file="common/browser_actions_overflow_normal.png" />
<structure type="chrome_scaled_image" name="IDR_BROWSER_ACTIONS_OVERFLOW_H" file="common/browser_actions_overflow_hover.png" />
<structure type="chrome_scaled_image" name="IDR_BROWSER_ACTIONS_OVERFLOW_P" file="common/browser_actions_overflow_pressed.png" />
<structure type="chrome_scaled_image" name="IDR_CLOSE_BUTTON_MASK" file="close_button_mask.png" />
<if expr="is_win">
<structure type="chrome_scaled_image" name="IDR_CONFLICT_BADGE" file="conflict_badge.png" />
......
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