Revert^2 "Uprev remote-shell to 6 and aura-shell to 63"

This reverts commit 4fc510ad71f7dd6484bc8385446e69764356b586.

Reason for revert: I believe this was not a culprit of b/315726892

Change-Id: I8856c24a0c52e8a53474c3c026316f055f6c4a67

2 files changed, 53 insertions, 4 deletions

diff --git a/chromium.org/unstable/aura-shell/aura-shell.xml b/chromium.org/unstable/aura-shell/aura-shell.xml
index 2d3ea86..c94c40c 100644
--- a/chromium.org/unstable/aura-shell/aura-shell.xml
+++ b/chromium.org/unstable/aura-shell/aura-shell.xml
@@ -24,7 +24,7 @@
     DEALINGS IN THE SOFTWARE.
   </copyright>
 
-  <interface name="zaura_shell" version="61">
+  <interface name="zaura_shell" version="63">
     <description summary="aura_shell">
       The global interface exposing aura shell capabilities is used to
       instantiate an interface extension for a wl_surface object.
@@ -805,7 +805,7 @@
     </event>
   </interface>
 
-  <interface name="zaura_toplevel" version="60">
+  <interface name="zaura_toplevel" version="63">
     <description summary="aura shell interface to the toplevel shell">
       An interface to the toplevel shell, which allows the
       client to access shell specific functionality.
@@ -1342,6 +1342,40 @@
       <arg name="lower_right_radius" type="uint"/>
       <arg name="lower_left_radius" type="uint"/>
     </request>
+
+    <!-- Version 62 additions -->
+    <enum name="in_overview">
+      <description summary="Describes whether or not the value is in overview">
+        Binary enum maps to boolean, describes whether or not a value is in
+        overview.
+      </description>
+      <entry name="not_in_overview" value="0" summary="the value is not in overview"/>
+      <entry name="in_overview" value="1" summary="the value is in overview"/>
+    </enum>
+
+    <event name="overview_change" since="62">
+      <description summary="window is in overview">
+        The window is being shown in overview mode. Note that this is
+        different than shell overview state, as not all windows will be
+        part of the overview grid.
+      </description>
+      <arg name="in_overview" type="uint" enum="in_overview" summary="in overview or not"/>
+    </event>
+
+    <!-- Version 63 additions -->
+    <request name="set_shadow_corner_radii" since="63">
+      <description summary="Request to apply rounded corners to the shadow of the surface.">
+        The client specifies the radius of each corner to be applied to the shadow
+        associated with the aura toplevel surface in device independent pixels (DPs).
+
+        The shadow radius is double buffered, and will be applied at the
+        time wl_surface.commit of the corresponding wl_surface is called.
+      </description>
+      <arg name="upper_left_radius" type="uint"/>
+      <arg name="upper_right_radius" type="uint"/>
+      <arg name="lower_right_radius" type="uint"/>
+      <arg name="lower_left_radius" type="uint"/>
+    </request>
   </interface>
 
   <interface name="zaura_popup" version="46">
diff --git a/chromium.org/unstable/remote-shell/remote-shell-unstable-v2.xml b/chromium.org/unstable/remote-shell/remote-shell-unstable-v2.xml
index 8c334a4..7a812f9 100644
--- a/chromium.org/unstable/remote-shell/remote-shell-unstable-v2.xml
+++ b/chromium.org/unstable/remote-shell/remote-shell-unstable-v2.xml
@@ -38,7 +38,7 @@
     reset.
   </description>
 
-  <interface name="zcr_remote_shell_v2" version="5">
+  <interface name="zcr_remote_shell_v2" version="6">
     <description summary="remote_shell">
       The global interface that allows clients to turn a wl_surface into a
       "real window" which is remotely managed but can be stacked, activated
@@ -595,7 +595,7 @@
       <entry name="normal" value="1" summary="caption with shadow"/>
       <entry name="shadow" value="2" summary="shadow only"/>
       <entry name="autohide" value="3" summary="autohide frame with shadow"/>
-      <entry name="overlay" value="4" summary="overlay frame with shadow"/>
+      <entry name="overlay" value="4" summary="[Deprecated] overlay frame with shadow"/>
       <entry name="overlap" value="5" summary="overlap frame with the window" since="6"/>
     </enum>
 
@@ -875,6 +875,21 @@
       <arg name="lower_right_radius" type="uint"/>
       <arg name="lower_left_radius" type="uint"/>
     </request>
+
+    <!-- Version 6 additions -->
+    <request name="set_shadow_corner_radii" since="6">
+      <description summary="Request to apply rounded corners to the shadow of the surface.">
+        The client specifies the radius of each corner to be applied to the shadow
+        associated with the aura toplevel surface in device independent pixels (DPs).
+
+        The shadow radius is double buffered, and will be applied at the
+        time wl_surface.commit of the corresponding wl_surface is called.
+      </description>
+      <arg name="upper_left_radius" type="uint"/>
+      <arg name="upper_right_radius" type="uint"/>
+      <arg name="lower_right_radius" type="uint"/>
+      <arg name="lower_left_radius" type="uint"/>
+    </request>
   </interface>
 
   <interface name="zcr_notification_surface_v2" version="1">