Revert of third_party: Update to version 8 of remote_shell_protocol

components/exo/wayland/server.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/exo/wayland/server.h"
 
 #include <grp.h>
 #include <linux/input.h>
 #include <stddef.h>
 #include <stdint.h>
@@ skipping 1479 matching lines @@
   GetUserDataAs<ShellSurface>(resource)->SetTitle(
       base::string16(base::UTF8ToUTF16(title)));
 }
 
 void remote_surface_set_top_inset(wl_client* client,
                                   wl_resource* resource,
                                   int32_t height) {
   GetUserDataAs<ShellSurface>(resource)->SetTopInset(height);
 }
 
-void remote_surface_set_system_modal(wl_client* client, wl_resource* resource) {
-  GetUserDataAs<ShellSurface>(resource)->SetSystemModal(true);
-}
-
-void remote_surface_unset_system_modal(wl_client* client,
-                                       wl_resource* resource) {
-  GetUserDataAs<ShellSurface>(resource)->SetSystemModal(false);
-}
-
 const struct zwp_remote_surface_v1_interface remote_surface_implementation = {
     remote_surface_destroy,
     remote_surface_set_app_id,
     remote_surface_set_window_geometry,
     remote_surface_set_scale,
     remote_surface_fullscreen,
     remote_surface_maximize,
     remote_surface_minimize,
     remote_surface_restore,
     remote_surface_pin,
     remote_surface_unpin,
     remote_surface_unfullscreen,
     remote_surface_set_rectangular_shadow,
     remote_surface_set_title,
-    remote_surface_set_top_inset,
-    remote_surface_set_system_modal,
-    remote_surface_unset_system_modal};
+    remote_surface_set_top_inset};
 
 ////////////////////////////////////////////////////////////////////////////////
 // notification_surface_interface:
 
 void notification_surface_destroy(wl_client* client, wl_resource* resource) {
   wl_resource_destroy(resource);
 }
 
 const struct zwp_notification_surface_v1_interface
     notification_surface_implementation = {notification_surface_destroy};
@@ skipping 41 matching lines @@
   void OnDisplayAdded(const display::Display& new_display) override {}
   void OnDisplayRemoved(const display::Display& new_display) override {}
   void OnDisplayMetricsChanged(const display::Display& display,
                                uint32_t metrics) override {
     if (display.id() == display_id_)
       SendConfigure();
   }
 
   // Overridden from ash::ShellObserver:
   void OnDisplayWorkAreaInsetsChanged() override { SendConfigure(); }
-  void OnMaximizeModeStarted() override {
-    SendLayoutModeChange(ZWP_REMOTE_SHELL_V1_LAYOUT_MODE_TABLET);
-  }
-  void OnMaximizeModeEnded() override {
-    SendLayoutModeChange(ZWP_REMOTE_SHELL_V1_LAYOUT_MODE_WINDOWED);
-  }
 
   // Overridden from aura::client::ActivationChangeObserver:
   void OnWindowActivated(
       aura::client::ActivationChangeObserver::ActivationReason reason,
       aura::Window* gained_active,
       aura::Window* lost_active) override {
     SendActivated(gained_active, lost_active);
   }
 
  private:
   void SendConfigure() {
     const display::Display& display =
         ash::Shell::GetInstance()->display_manager()->GetDisplayForId(
             display_id_);
     gfx::Insets work_area_insets = display.GetWorkAreaInsets();
     zwp_remote_shell_v1_send_configure(
         remote_shell_resource_, display.size().width(), display.size().height(),
         work_area_insets.left(), work_area_insets.top(),
         work_area_insets.right(), work_area_insets.bottom());
     wl_client_flush(wl_resource_get_client(remote_shell_resource_));
   }
 
-  void SendLayoutModeChange(int mode) {
-    if (wl_resource_get_version(remote_shell_resource_) < 8)
-      return;
-    zwp_remote_shell_v1_send_layout_mode_changed(remote_shell_resource_, mode);
-    wl_client_flush(wl_resource_get_client(remote_shell_resource_));
-  }
-
   void SendActivated(aura::Window* gained_active, aura::Window* lost_active) {
     Surface* gained_active_surface =
         gained_active ? ShellSurface::GetMainSurface(gained_active) : nullptr;
     Surface* lost_active_surface =
         lost_active ? ShellSurface::GetMainSurface(lost_active) : nullptr;
     wl_resource* gained_active_surface_resource =
         gained_active_surface ? GetSurfaceResource(gained_active_surface)
                               : nullptr;
     wl_resource* lost_active_surface_resource =
         lost_active_surface ? GetSurfaceResource(lost_active_surface) : nullptr;
@@ skipping 165 matching lines @@
                          wl_resource_get_version(resource), id);
   SetImplementation(notification_surface_resource,
                     &notification_surface_implementation,
                     std::move(notification_surface));
 }
 
 const struct zwp_remote_shell_v1_interface remote_shell_implementation = {
     remote_shell_destroy, remote_shell_get_remote_surface,
     remote_shell_get_notification_surface};
 
-const uint32_t remote_shell_version = 8;
+const uint32_t remote_shell_version = 6;
 
 void bind_remote_shell(wl_client* client,
                        void* data,
                        uint32_t version,
                        uint32_t id) {
   wl_resource* resource =
       wl_resource_create(client, &zwp_remote_shell_v1_interface,
                          std::min(version, remote_shell_version), id);
 
   // TODO(reveman): Multi-display support.
@@ skipping 1052 matching lines @@
   DCHECK(event_loop);
   wl_event_loop_dispatch(event_loop, timeout.InMilliseconds());
 }
 
 void Server::Flush() {
   wl_display_flush_clients(wl_display_.get());
 }
 
 }  // namespace wayland
 }  // namespace exo