Make aura and ash to have a different tools menu icon

This allows for quickly telling appart ash/aura versus non ash builds

BUG=173287
TEST=see bug
Review URL: https://codereview.chromium.org/12079087

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180167 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 14 insertions, 6 deletions

diff --git a/chrome/app/theme/default_100_percent/common/browser_tools_normal_ash.png b/chrome/app/theme/default_100_percent/common/browser_tools_normal_ash.png
new file mode 100644
index 0000000..5355792
--- /dev/null
+++ b/chrome/app/theme/default_100_percent/common/browser_tools_normal_ash.png
diff --git a/chrome/app/theme/default_200_percent/common/browser_tools_normal_ash.png b/chrome/app/theme/default_200_percent/common/browser_tools_normal_ash.png
new file mode 100644
index 0000000..a9f2dc5
--- /dev/null
+++ b/chrome/app/theme/default_200_percent/common/browser_tools_normal_ash.png
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index d47ded7..ea3ed73 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -828,13 +828,21 @@
       <if expr="is_macosx">
         <structure type="chrome_scaled_image" name="IDR_TOOLBAR_SHADE_TOP" file="mac/toolbar_shade_top.png" />
       </if>
-      <if expr="not pp_ifdef('toolkit_views') and not is_macosx">
-        <structure type="chrome_scaled_image" name="IDR_TOOLS" file="tools.png" />
-        <structure type="chrome_scaled_image" name="IDR_TOOLS_H" file="tools_hover.png" />
-        <structure type="chrome_scaled_image" name="IDR_TOOLS_P" file="tools_pressed.png" />
+      <!-- For non-chromeos aura the tools menu button in the normal state is slightly different -->
+      <if expr="not pp_ifdef('use_ash') or pp_ifdef('chromeos')">
+        <if expr="not pp_ifdef('toolkit_views') and not is_macosx">
+          <structure type="chrome_scaled_image" name="IDR_TOOLS" file="tools.png" />
+          <structure type="chrome_scaled_image" name="IDR_TOOLS_H" file="tools_hover.png" />
+          <structure type="chrome_scaled_image" name="IDR_TOOLS_P" file="tools_pressed.png" />
+        </if>
+        <if expr="pp_ifdef('toolkit_views') or is_macosx">
+          <structure type="chrome_scaled_image" name="IDR_TOOLS" file="common/browser_tools_normal.png" />
+          <structure type="chrome_scaled_image" name="IDR_TOOLS_H" file="common/browser_tools_hover.png" />
+          <structure type="chrome_scaled_image" name="IDR_TOOLS_P" file="common/browser_tools_pressed.png" />
+        </if>
       </if>
-      <if expr="pp_ifdef('toolkit_views') or is_macosx">
-        <structure type="chrome_scaled_image" name="IDR_TOOLS" file="common/browser_tools_normal.png" />
+      <if expr="pp_ifdef('use_ash') and not pp_ifdef('chromeos')">
+        <structure type="chrome_scaled_image" name="IDR_TOOLS" file="common/browser_tools_normal_ash.png" />
         <structure type="chrome_scaled_image" name="IDR_TOOLS_H" file="common/browser_tools_hover.png" />
         <structure type="chrome_scaled_image" name="IDR_TOOLS_P" file="common/browser_tools_pressed.png" />
       </if>
diff --git a/chrome/app/theme/touch_100_percent/common/browser_tools_normal_ash.png b/chrome/app/theme/touch_100_percent/common/browser_tools_normal_ash.png
new file mode 100644
index 0000000..95bf4fd
--- /dev/null
+++ b/chrome/app/theme/touch_100_percent/common/browser_tools_normal_ash.png
diff --git a/chrome/app/theme/touch_140_percent/common/browser_tools_normal_ash.png b/chrome/app/theme/touch_140_percent/common/browser_tools_normal_ash.png
new file mode 100644
index 0000000..1597837
--- /dev/null
+++ b/chrome/app/theme/touch_140_percent/common/browser_tools_normal_ash.png
diff --git a/chrome/app/theme/touch_180_percent/common/browser_tools_normal_ash.png b/chrome/app/theme/touch_180_percent/common/browser_tools_normal_ash.png
new file mode 100644
index 0000000..5233ca8
--- /dev/null
+++ b/chrome/app/theme/touch_180_percent/common/browser_tools_normal_ash.png