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

22 files changed, 3 insertions, 13 deletions

diff --git a/chrome/app/theme/default_100_percent/browser_actions_overflow.png b/chrome/app/theme/default_100_percent/browser_actions_overflow.png
deleted file mode 100644
index 550de8c..0000000
--- a/chrome/app/theme/default_100_percent/browser_actions_overflow.png
+++ /dev/null
diff --git a/chrome/app/theme/default_100_percent/browser_actions_overflow_hover.png b/chrome/app/theme/default_100_percent/browser_actions_overflow_hover.png
deleted file mode 100644
index 18879e8..0000000
--- a/chrome/app/theme/default_100_percent/browser_actions_overflow_hover.png
+++ /dev/null
diff --git a/chrome/app/theme/default_100_percent/browser_actions_overflow_pressed.png b/chrome/app/theme/default_100_percent/browser_actions_overflow_pressed.png
deleted file mode 100644
index 9f3afba..0000000
--- a/chrome/app/theme/default_100_percent/browser_actions_overflow_pressed.png
+++ /dev/null
diff --git a/chrome/app/theme/default_100_percent/browser_actions_overflow_win.png b/chrome/app/theme/default_100_percent/browser_actions_overflow_win.png
deleted file mode 100644
index 85353ca..0000000
--- a/chrome/app/theme/default_100_percent/browser_actions_overflow_win.png
+++ /dev/null
diff --git a/chrome/app/theme/default_100_percent/browser_actions_overflow_win_hover.png b/chrome/app/theme/default_100_percent/browser_actions_overflow_win_hover.png
deleted file mode 100644
index d556af9..0000000
--- a/chrome/app/theme/default_100_percent/browser_actions_overflow_win_hover.png
+++ /dev/null
diff --git a/chrome/app/theme/default_100_percent/browser_actions_overflow_win_pressed.png b/chrome/app/theme/default_100_percent/browser_actions_overflow_win_pressed.png
deleted file mode 100644
index a40476a..0000000
--- a/chrome/app/theme/default_100_percent/browser_actions_overflow_win_pressed.png
+++ /dev/null
diff --git a/chrome/app/theme/default_100_percent/common/browser_actions_overflow_hover.png b/chrome/app/theme/default_100_percent/common/browser_actions_overflow_hover.png
index 52dec32..4d843a0 100644
--- a/chrome/app/theme/default_100_percent/common/browser_actions_overflow_hover.png
+++ b/chrome/app/theme/default_100_percent/common/browser_actions_overflow_hover.png
diff --git a/chrome/app/theme/default_100_percent/common/browser_actions_overflow_normal.png b/chrome/app/theme/default_100_percent/common/browser_actions_overflow_normal.png
index e2d06e1..491279b 100644
--- a/chrome/app/theme/default_100_percent/common/browser_actions_overflow_normal.png
+++ b/chrome/app/theme/default_100_percent/common/browser_actions_overflow_normal.png
diff --git a/chrome/app/theme/default_100_percent/common/browser_actions_overflow_pressed.png b/chrome/app/theme/default_100_percent/common/browser_actions_overflow_pressed.png
index a7e4bdb..3dcc36d 100644
--- a/chrome/app/theme/default_100_percent/common/browser_actions_overflow_pressed.png
+++ b/chrome/app/theme/default_100_percent/common/browser_actions_overflow_pressed.png
diff --git a/chrome/app/theme/default_100_percent/mac/browser_actions_overflow_hover.png b/chrome/app/theme/default_100_percent/mac/browser_actions_overflow_hover.png
deleted file mode 100644
index 4d843a0..0000000
--- a/chrome/app/theme/default_100_percent/mac/browser_actions_overflow_hover.png
+++ /dev/null
diff --git a/chrome/app/theme/default_100_percent/mac/browser_actions_overflow_normal.png b/chrome/app/theme/default_100_percent/mac/browser_actions_overflow_normal.png
deleted file mode 100644
index 491279b..0000000
--- a/chrome/app/theme/default_100_percent/mac/browser_actions_overflow_normal.png
+++ /dev/null
diff --git a/chrome/app/theme/default_100_percent/mac/browser_actions_overflow_pressed.png b/chrome/app/theme/default_100_percent/mac/browser_actions_overflow_pressed.png
deleted file mode 100644
index 3dcc36d..0000000
--- a/chrome/app/theme/default_100_percent/mac/browser_actions_overflow_pressed.png
+++ /dev/null
diff --git a/chrome/app/theme/default_200_percent/browser_actions_overflow.png b/chrome/app/theme/default_200_percent/browser_actions_overflow.png
deleted file mode 100644
index 642f0bb..0000000
--- a/chrome/app/theme/default_200_percent/browser_actions_overflow.png
+++ /dev/null
diff --git a/chrome/app/theme/default_200_percent/browser_actions_overflow_hover.png b/chrome/app/theme/default_200_percent/browser_actions_overflow_hover.png
deleted file mode 100644
index bb84f41..0000000
--- a/chrome/app/theme/default_200_percent/browser_actions_overflow_hover.png
+++ /dev/null
diff --git a/chrome/app/theme/default_200_percent/browser_actions_overflow_pressed.png b/chrome/app/theme/default_200_percent/browser_actions_overflow_pressed.png
deleted file mode 100644
index 336cdb3..0000000
--- a/chrome/app/theme/default_200_percent/browser_actions_overflow_pressed.png
+++ /dev/null
diff --git a/chrome/app/theme/default_200_percent/common/browser_actions_overflow_hover.png b/chrome/app/theme/default_200_percent/common/browser_actions_overflow_hover.png
index f350e47..f7bf78b 100644
--- a/chrome/app/theme/default_200_percent/common/browser_actions_overflow_hover.png
+++ b/chrome/app/theme/default_200_percent/common/browser_actions_overflow_hover.png
diff --git a/chrome/app/theme/default_200_percent/common/browser_actions_overflow_normal.png b/chrome/app/theme/default_200_percent/common/browser_actions_overflow_normal.png
index 841cfa6..728bb57 100644
--- a/chrome/app/theme/default_200_percent/common/browser_actions_overflow_normal.png
+++ b/chrome/app/theme/default_200_percent/common/browser_actions_overflow_normal.png
diff --git a/chrome/app/theme/default_200_percent/common/browser_actions_overflow_pressed.png b/chrome/app/theme/default_200_percent/common/browser_actions_overflow_pressed.png
index ac64e6e..69bad3e 100644
--- a/chrome/app/theme/default_200_percent/common/browser_actions_overflow_pressed.png
+++ b/chrome/app/theme/default_200_percent/common/browser_actions_overflow_pressed.png
diff --git a/chrome/app/theme/default_200_percent/mac/browser_actions_overflow_hover.png b/chrome/app/theme/default_200_percent/mac/browser_actions_overflow_hover.png
deleted file mode 100644
index f7bf78b..0000000
--- a/chrome/app/theme/default_200_percent/mac/browser_actions_overflow_hover.png
+++ /dev/null
diff --git a/chrome/app/theme/default_200_percent/mac/browser_actions_overflow_normal.png b/chrome/app/theme/default_200_percent/mac/browser_actions_overflow_normal.png
deleted file mode 100644
index 728bb57..0000000
--- a/chrome/app/theme/default_200_percent/mac/browser_actions_overflow_normal.png
+++ /dev/null
diff --git a/chrome/app/theme/default_200_percent/mac/browser_actions_overflow_pressed.png b/chrome/app/theme/default_200_percent/mac/browser_actions_overflow_pressed.png
deleted file mode 100644
index 69bad3e..0000000
--- a/chrome/app/theme/default_200_percent/mac/browser_actions_overflow_pressed.png
+++ /dev/null
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index 954bc8d..1dea24e 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -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" />