Aura: Square window frame

For performance reasons, make the default Aura window frame fully opaque.  Use square corners to avoid alpha.

BUG=102692
TEST=none

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

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

19 files changed, 28 insertions, 26 deletions

diff --git a/ui/resources/aura/maximize.png b/ui/resources/aura/maximize.png
new file mode 100644
index 0000000..2d62ef4
--- /dev/null
+++ b/ui/resources/aura/maximize.png
diff --git a/ui/resources/aura/maximize_h.png b/ui/resources/aura/maximize_h.png
new file mode 100644
index 0000000..cfc4a46
--- /dev/null
+++ b/ui/resources/aura/maximize_h.png
diff --git a/ui/resources/aura/maximize_p.png b/ui/resources/aura/maximize_p.png
new file mode 100644
index 0000000..669c338
--- /dev/null
+++ b/ui/resources/aura/maximize_p.png
diff --git a/ui/resources/aura/restore.png b/ui/resources/aura/restore.png
new file mode 100644
index 0000000..4968645
--- /dev/null
+++ b/ui/resources/aura/restore.png
diff --git a/ui/resources/aura/restore_h.png b/ui/resources/aura/restore_h.png
new file mode 100644
index 0000000..a853e5e
--- /dev/null
+++ b/ui/resources/aura/restore_h.png
diff --git a/ui/resources/aura/restore_p.png b/ui/resources/aura/restore_p.png
new file mode 100644
index 0000000..8b3762b
--- /dev/null
+++ b/ui/resources/aura/restore_p.png
diff --git a/ui/resources/aura/window_bottom_left.png b/ui/resources/aura/window_bottom_left.png
new file mode 100644
index 0000000..a9c6f0a
--- /dev/null
+++ b/ui/resources/aura/window_bottom_left.png
diff --git a/ui/resources/aura/window_bottom_right.png b/ui/resources/aura/window_bottom_right.png
new file mode 100644
index 0000000..77b842f
--- /dev/null
+++ b/ui/resources/aura/window_bottom_right.png
diff --git a/ui/resources/aura/window_top_left.png b/ui/resources/aura/window_top_left.png
new file mode 100644
index 0000000..05adf9d
--- /dev/null
+++ b/ui/resources/aura/window_top_left.png
diff --git a/ui/resources/aura/window_top_right.png b/ui/resources/aura/window_top_right.png
new file mode 100644
index 0000000..d22a09e
--- /dev/null
+++ b/ui/resources/aura/window_top_right.png
diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd
index accdcf1..2eb6b05 100644
--- a/ui/resources/ui_resources.grd
+++ b/ui/resources/ui_resources.grd
@@ -38,12 +38,18 @@
       <include name="IDR_FRAME" file="frame_default.png" type="BINDATA" />
       <include name="IDR_FRAME_APP_PANEL" file="frame_app_panel_default.png" type="BINDATA" />
       <include name="IDR_FRAME_INACTIVE" file="frame_default_inactive.png" type="BINDATA" />
-      <if expr="pp_ifdef('toolkit_views')">
+      <if expr="pp_ifdef('use_aura')">
+        <!-- TODO(jamescook): Delete these when Aura uses its own custom window frame, BrowserNonClientFrameViewAura. -->
+        <include name="IDR_MAXIMIZE" file="aura/maximize.png" type="BINDATA" />
+        <include name="IDR_MAXIMIZE_H" file="aura/maximize_h.png" type="BINDATA" />
+        <include name="IDR_MAXIMIZE_P" file="aura/maximize_p.png" type="BINDATA" />
+      </if>
+      <if expr="not pp_ifdef('use_aura') and pp_ifdef('toolkit_views')">
         <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" />
       </if>
-      <if expr="not pp_ifdef('toolkit_views') and is_posix and not is_macosx">
+      <if expr="not pp_ifdef('use_aura') and not pp_ifdef('toolkit_views') and is_posix and not is_macosx">
         <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" />
@@ -60,12 +66,18 @@
         <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>
-      <if expr="pp_ifdef('toolkit_views')">
+      <if expr="pp_ifdef('use_aura')">
+        <!-- TODO(jamescook): Delete these when Aura uses its own custom window frame, BrowserNonClientFrameViewAura. -->
+        <include name="IDR_RESTORE" file="aura/restore.png" type="BINDATA" />
+        <include name="IDR_RESTORE_H" file="aura/restore_h.png" type="BINDATA" />
+        <include name="IDR_RESTORE_P" file="aura/restore_p.png" type="BINDATA" />
+      </if>
+      <if expr="not pp_ifdef('use_aura') and pp_ifdef('toolkit_views')">
         <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" />
       </if>
-      <if expr="not pp_ifdef('toolkit_views') and is_posix and not is_macosx">
+      <if expr="not pp_ifdef('use_aura') and not pp_ifdef('toolkit_views') and is_posix and not is_macosx">
         <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" />
@@ -94,28 +106,14 @@
       <if expr="pp_ifdef('touchui')">
           <include name="IDR_THROBBER" file="large_throbber.png" type="BINDATA" />
       </if>
-      <!-- TODO(jamescook): Delete all these resources when Aura uses its own
-           transparent window frame. -->
-      <if expr="pp_ifdef('use_aura')">
-        <include name="IDR_WINDOW_BOTTOM_CENTER" file="window_bottom_center_aura.png" type="BINDATA" />
-        <include name="IDR_WINDOW_BOTTOM_LEFT_CORNER" file="window_bottom_left_corner_aura.png" type="BINDATA" />
-        <include name="IDR_WINDOW_BOTTOM_RIGHT_CORNER" file="window_bottom_right_corner_aura.png" type="BINDATA" />
-        <include name="IDR_WINDOW_LEFT_SIDE" file="window_left_side_aura.png" type="BINDATA" />
-        <include name="IDR_WINDOW_RIGHT_SIDE" file="window_right_side_aura.png" type="BINDATA" />
-        <include name="IDR_WINDOW_TOP_CENTER" file="window_top_center_aura.png" type="BINDATA" />
-        <include name="IDR_WINDOW_TOP_LEFT_CORNER" file="window_top_left_corner_aura.png" type="BINDATA" />
-        <include name="IDR_WINDOW_TOP_RIGHT_CORNER" file="window_top_right_corner_aura.png" type="BINDATA" />
-      </if>
-      <if expr="not pp_ifdef('use_aura')">
-        <include name="IDR_WINDOW_BOTTOM_CENTER" file="window_bottom_center.png" type="BINDATA" />
-        <include name="IDR_WINDOW_BOTTOM_LEFT_CORNER" file="window_bottom_left_corner.png" type="BINDATA" />
-        <include name="IDR_WINDOW_BOTTOM_RIGHT_CORNER" file="window_bottom_right_corner.png" type="BINDATA" />
-        <include name="IDR_WINDOW_LEFT_SIDE" file="window_left_side.png" type="BINDATA" />
-        <include name="IDR_WINDOW_RIGHT_SIDE" file="window_right_side.png" type="BINDATA" />
-        <include name="IDR_WINDOW_TOP_CENTER" file="window_top_center.png" type="BINDATA" />
-        <include name="IDR_WINDOW_TOP_LEFT_CORNER" file="window_top_left_corner.png" type="BINDATA" />
-        <include name="IDR_WINDOW_TOP_RIGHT_CORNER" file="window_top_right_corner.png" type="BINDATA" />
-      </if>
+      <include name="IDR_WINDOW_BOTTOM_CENTER" file="window_bottom_center.png" type="BINDATA" />
+      <include name="IDR_WINDOW_BOTTOM_LEFT_CORNER" file="window_bottom_left_corner.png" type="BINDATA" />
+      <include name="IDR_WINDOW_BOTTOM_RIGHT_CORNER" file="window_bottom_right_corner.png" type="BINDATA" />
+      <include name="IDR_WINDOW_LEFT_SIDE" file="window_left_side.png" type="BINDATA" />
+      <include name="IDR_WINDOW_RIGHT_SIDE" file="window_right_side.png" type="BINDATA" />
+      <include name="IDR_WINDOW_TOP_CENTER" file="window_top_center.png" type="BINDATA" />
+      <include name="IDR_WINDOW_TOP_LEFT_CORNER" file="window_top_left_corner.png" type="BINDATA" />
+      <include name="IDR_WINDOW_TOP_RIGHT_CORNER" file="window_top_right_corner.png" type="BINDATA" />
 
       <!-- Images only used by the Views toolkit. -->
       <if expr="pp_ifdef('toolkit_views')">
@@ -138,6 +136,10 @@
         <include name="IDR_AURA_STATUS_MOCK" file="aura/statusbar.png" type="BINDATA" />
         <include name="IDR_AURA_WALLPAPER" file="aura/damask.png" type="BINDATA" />
         <include name="IDR_AURA_WINDOW_CLOSE_ICON" file="aura/slab_close.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_BOTTOM_LEFT" file="aura/window_bottom_left.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_BOTTOM_RIGHT" file="aura/window_bottom_right.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_TOP_LEFT" file="aura/window_top_left.png" type="BINDATA" />
+        <include name="IDR_AURA_WINDOW_TOP_RIGHT" file="aura/window_top_right.png" type="BINDATA" />
         <include name="IDR_AURA_WINDOW_ZOOM_ICON" file="aura/slab_zoom.png" type="BINDATA" />
       </if>
     </includes>
diff --git a/ui/resources/window_bottom_center_aura.png b/ui/resources/window_bottom_center_aura.png
deleted file mode 100644
index d7c6ccd..0000000
--- a/ui/resources/window_bottom_center_aura.png
+++ /dev/null
diff --git a/ui/resources/window_bottom_left_corner_aura.png b/ui/resources/window_bottom_left_corner_aura.png
deleted file mode 100644
index 2c62d06..0000000
--- a/ui/resources/window_bottom_left_corner_aura.png
+++ /dev/null
diff --git a/ui/resources/window_bottom_right_corner_aura.png b/ui/resources/window_bottom_right_corner_aura.png
deleted file mode 100644
index e3a9be2..0000000
--- a/ui/resources/window_bottom_right_corner_aura.png
+++ /dev/null
diff --git a/ui/resources/window_left_side_aura.png b/ui/resources/window_left_side_aura.png
deleted file mode 100644
index cd31cb7..0000000
--- a/ui/resources/window_left_side_aura.png
+++ /dev/null
diff --git a/ui/resources/window_right_side_aura.png b/ui/resources/window_right_side_aura.png
deleted file mode 100644
index 95e32bb..0000000
--- a/ui/resources/window_right_side_aura.png
+++ /dev/null
diff --git a/ui/resources/window_top_center_aura.png b/ui/resources/window_top_center_aura.png
deleted file mode 100644
index fed8c0a..0000000
--- a/ui/resources/window_top_center_aura.png
+++ /dev/null
diff --git a/ui/resources/window_top_left_corner_aura.png b/ui/resources/window_top_left_corner_aura.png
deleted file mode 100644
index d1a0f3c..0000000
--- a/ui/resources/window_top_left_corner_aura.png
+++ /dev/null
diff --git a/ui/resources/window_top_right_corner_aura.png b/ui/resources/window_top_right_corner_aura.png
deleted file mode 100644
index 3b7a118..0000000
--- a/ui/resources/window_top_right_corner_aura.png
+++ /dev/null