linux: use linux-specific window control graphics from glen

BUG=15952,18385

Review URL: http://codereview.chromium.org/159859

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

17 files changed, 33 insertions, 19 deletions

diff --git a/app/resources/app_resources.grd b/app/resources/app_resources.grd
index 820283c..8b7579d 100644
--- a/app/resources/app_resources.grd
+++ b/app/resources/app_resources.grd
@@ -12,26 +12,40 @@
 
       <include name="IDR_DEFAULT_FAVICON" file="default_favicon.png" type="BINDATA" />
 
-      <!-- Window Controls -->
-      <include name="IDR_CLOSE" file="close.png" type="BINDATA" />
-      <include name="IDR_CLOSE_H" file="close_h.png" type="BINDATA" />
-      <include name="IDR_CLOSE_P" file="close_p.png" type="BINDATA" />
-      <include name="IDR_CLOSE_SA" file="close_sa.png" type="BINDATA" />
-      <include name="IDR_CLOSE_SA_H" file="close_sa_h.png" type="BINDATA" />
-      <include name="IDR_CLOSE_SA_P" file="close_sa_p.png" type="BINDATA" />
-      <include name="IDR_RESTORE" file="restore.png" type="BINDATA" />
-      <include name="IDR_RESTORE_H" file="restore_h.png" type="BINDATA" />
-      <include name="IDR_RESTORE_P" file="restore_p.png" type="BINDATA" />
-      <include name="IDR_MAXIMIZE" file="maximize.png" type="BINDATA" />
-      <include name="IDR_MAXIMIZE_H" file="maximize_h.png" type="BINDATA" />
-      <include name="IDR_MAXIMIZE_P" file="maximize_p.png" type="BINDATA" />
-      <include name="IDR_MINIMIZE" file="minimize.png" type="BINDATA" />
-      <include name="IDR_MINIMIZE_H" file="minimize_h.png" type="BINDATA" />
-      <include name="IDR_MINIMIZE_P" file="minimize_p.png" type="BINDATA" />
+      <if expr="os == 'win32'">
+        <!-- Window controls for Windows, in the style of Vista -->
+        <include name="IDR_CLOSE" file="close.png" type="BINDATA" />
+        <include name="IDR_CLOSE_H" file="close_h.png" type="BINDATA" />
+        <include name="IDR_CLOSE_P" file="close_p.png" type="BINDATA" />
+        <include name="IDR_CLOSE_SA" file="close_sa.png" type="BINDATA" />
+        <include name="IDR_CLOSE_SA_H" file="close_sa_h.png" type="BINDATA" />
+        <include name="IDR_CLOSE_SA_P" file="close_sa_p.png" type="BINDATA" />
+        <include name="IDR_RESTORE" file="restore.png" type="BINDATA" />
+        <include name="IDR_RESTORE_H" file="restore_h.png" type="BINDATA" />
+        <include name="IDR_RESTORE_P" file="restore_p.png" type="BINDATA" />
+        <include name="IDR_MAXIMIZE" file="maximize.png" type="BINDATA" />
+        <include name="IDR_MAXIMIZE_H" file="maximize_h.png" type="BINDATA" />
+        <include name="IDR_MAXIMIZE_P" file="maximize_p.png" type="BINDATA" />
+        <include name="IDR_MINIMIZE" file="minimize.png" type="BINDATA" />
+        <include name="IDR_MINIMIZE_H" file="minimize_h.png" type="BINDATA" />
+        <include name="IDR_MINIMIZE_P" file="minimize_p.png" type="BINDATA" />
+      </if>
 
-      <include name="IDR_LINUX_CLOSE" file="linux_close.png" type="BINDATA" />
-      <include name="IDR_LINUX_CLOSE_H" file="linux_close.png" type="BINDATA" />
-      <include name="IDR_LINUX_CLOSE_P" file="linux_close.png" type="BINDATA" />
+      <if expr="os == 'linux2'">
+        <!-- Window controls for Linux, in the style of Metacity -->
+        <include name="IDR_CLOSE" file="linux_close.png" type="BINDATA" />
+        <include name="IDR_CLOSE_H" file="linux_close_h.png" type="BINDATA" />
+        <include name="IDR_CLOSE_P" file="linux_close_p.png" type="BINDATA" />
+        <include name="IDR_RESTORE" file="linux_restore.png" type="BINDATA" />
+        <include name="IDR_RESTORE_H" file="linux_restore_h.png" type="BINDATA" />
+        <include name="IDR_RESTORE_P" file="linux_restore_p.png" type="BINDATA" />
+        <include name="IDR_MAXIMIZE" file="linux_maximize.png" type="BINDATA" />
+        <include name="IDR_MAXIMIZE_H" file="linux_maximize_h.png" type="BINDATA" />
+        <include name="IDR_MAXIMIZE_P" file="linux_maximize_p.png" type="BINDATA" />
+        <include name="IDR_MINIMIZE" file="linux_minimize.png" type="BINDATA" />
+        <include name="IDR_MINIMIZE_H" file="linux_minimize_h.png" type="BINDATA" />
+        <include name="IDR_MINIMIZE_P" file="linux_minimize_p.png" type="BINDATA" />
+      </if>
 
       <!-- Frame Images -->
       <include name="IDR_FRAME" file="frame_default.png" type="BINDATA" />
diff --git a/app/resources/linux_close.png b/app/resources/linux_close.png
index 26e8d81..0a867b1 100644
--- a/app/resources/linux_close.png
+++ b/app/resources/linux_close.png
diff --git a/app/resources/linux_close_glen.png b/app/resources/linux_close_glen.png
new file mode 100644
index 0000000..26e8d81
--- /dev/null
+++ b/app/resources/linux_close_glen.png
diff --git a/app/resources/linux_close_h.png b/app/resources/linux_close_h.png
new file mode 100644
index 0000000..dbcbe55
--- /dev/null
+++ b/app/resources/linux_close_h.png
diff --git a/app/resources/linux_close_mask.png b/app/resources/linux_close_mask.png
new file mode 100644
index 0000000..4777c99
--- /dev/null
+++ b/app/resources/linux_close_mask.png
diff --git a/app/resources/linux_close_p.png b/app/resources/linux_close_p.png
new file mode 100644
index 0000000..8d5e341
--- /dev/null
+++ b/app/resources/linux_close_p.png
diff --git a/app/resources/linux_maximize.png b/app/resources/linux_maximize.png
new file mode 100644
index 0000000..4ae1eb1
--- /dev/null
+++ b/app/resources/linux_maximize.png
diff --git a/app/resources/linux_maximize_h.png b/app/resources/linux_maximize_h.png
new file mode 100644
index 0000000..98cfb11
--- /dev/null
+++ b/app/resources/linux_maximize_h.png
diff --git a/app/resources/linux_maximize_mask.png b/app/resources/linux_maximize_mask.png
new file mode 100644
index 0000000..4777c99
--- /dev/null
+++ b/app/resources/linux_maximize_mask.png
diff --git a/app/resources/linux_maximize_p.png b/app/resources/linux_maximize_p.png
new file mode 100644
index 0000000..31b53a0
--- /dev/null
+++ b/app/resources/linux_maximize_p.png
diff --git a/app/resources/linux_minimize.png b/app/resources/linux_minimize.png
new file mode 100644
index 0000000..ff96266
--- /dev/null
+++ b/app/resources/linux_minimize.png
diff --git a/app/resources/linux_minimize_h.png b/app/resources/linux_minimize_h.png
new file mode 100644
index 0000000..cc6e0b0
--- /dev/null
+++ b/app/resources/linux_minimize_h.png
diff --git a/app/resources/linux_minimize_mask.png b/app/resources/linux_minimize_mask.png
new file mode 100644
index 0000000..4777c99
--- /dev/null
+++ b/app/resources/linux_minimize_mask.png
diff --git a/app/resources/linux_minimize_p.png b/app/resources/linux_minimize_p.png
new file mode 100644
index 0000000..8f81623
--- /dev/null
+++ b/app/resources/linux_minimize_p.png
diff --git a/app/resources/linux_restore.png b/app/resources/linux_restore.png
new file mode 100644
index 0000000..fab262b
--- /dev/null
+++ b/app/resources/linux_restore.png
diff --git a/app/resources/linux_restore_h.png b/app/resources/linux_restore_h.png
new file mode 100644
index 0000000..74b9874
--- /dev/null
+++ b/app/resources/linux_restore_h.png
diff --git a/app/resources/linux_restore_p.png b/app/resources/linux_restore_p.png
new file mode 100644
index 0000000..a82b4e7
--- /dev/null
+++ b/app/resources/linux_restore_p.png