Allow arc app to lock screen orientation in TouchView/Tablet mode

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 19 matching lines @@
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm_shell.h"
 #include "ash/display/display_manager.h"
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/cancelable_callback.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/memory/free_deleter.h"
 #include "base/memory/ptr_util.h"
+#include "base/memory/weak_ptr.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/threading/thread_task_runner_handle.h"
 #include "components/exo/buffer.h"
 #include "components/exo/display.h"
 #include "components/exo/keyboard.h"
 #include "components/exo/keyboard_delegate.h"
 #include "components/exo/notification_surface.h"
 #include "components/exo/notification_surface_manager.h"
 #include "components/exo/pointer.h"
 #include "components/exo/pointer_delegate.h"
 #include "components/exo/shared_memory.h"
 #include "components/exo/shell_surface.h"
@@ skipping 28 matching lines @@
 #include "ui/events/keycodes/scoped_xkb.h"  // nogncheck
 #endif
 
 DECLARE_SURFACE_PROPERTY_TYPE(wl_resource*);
 DECLARE_SURFACE_PROPERTY_TYPE(bool);
 
 namespace exo {
 namespace wayland {
 namespace {
 
+// We don't send configure immediately after tablet mode switch
+// because layout can change due to orientation lock state or accelerometer.
+const int kConfigureDelayAfterLayoutSwitchMs = 300;
+
 // Default wayland socket name.
 const base::FilePath::CharType kSocketName[] = FILE_PATH_LITERAL("wayland-0");
 
 // Group used for wayland socket.
 const char kWaylandSocketGroup[] = "wayland";
 
 template <class T>
 T* GetUserDataAs(wl_resource* resource) {
   return static_cast<T*>(wl_resource_get_user_data(resource));
 }
@@ skipping 1441 matching lines @@
 // for the remote shell interface.
 class WaylandRemoteShell : public ash::ShellObserver,
                            public aura::client::ActivationChangeObserver,
                            public display::DisplayObserver {
  public:
   WaylandRemoteShell(Display* display,
                      int64_t display_id,
                      wl_resource* remote_shell_resource)
       : display_(display),
         display_id_(display_id),
-        remote_shell_resource_(remote_shell_resource) {
+        remote_shell_resource_(remote_shell_resource),
+        weak_ptr_factory_(this) {
     ash::WmShell::Get()->AddShellObserver(this);
     ash::Shell* shell = ash::Shell::GetInstance();
     shell->activation_client()->AddObserver(this);
     display::Screen::GetScreen()->AddObserver(this);
     SendConfigure();
     SendActivated(shell->activation_client()->GetActiveWindow(), nullptr);
   }
   ~WaylandRemoteShell() override {
     ash::WmShell::Get()->RemoveShellObserver(this);
     ash::Shell::GetInstance()->activation_client()->RemoveObserver(this);
@@ skipping 17 matching lines @@
   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);
+    send_configure_after_layout_change_ = true;
+    base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
+        FROM_HERE, base::Bind(&WaylandRemoteShell::MaybeSendConfigure,
+                              weak_ptr_factory_.GetWeakPtr()),
+        base::TimeDelta::FromMilliseconds(kConfigureDelayAfterLayoutSwitchMs));
   }
   void OnMaximizeModeEnded() override {
     SendLayoutModeChange(ZWP_REMOTE_SHELL_V1_LAYOUT_MODE_WINDOWED);
+    send_configure_after_layout_change_ = true;
+    base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
+        FROM_HERE, base::Bind(&WaylandRemoteShell::MaybeSendConfigure,
+                              weak_ptr_factory_.GetWeakPtr()),
+        base::TimeDelta::FromMilliseconds(kConfigureDelayAfterLayoutSwitchMs));
   }
 
   // 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 MaybeSendConfigure() {
+    if (send_configure_after_layout_change_)
+      SendConfigure();
+  }
+
   void SendConfigure() {
+    send_configure_after_layout_change_ = false;
     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) {
+  void SendLayoutModeChange(uint32_t 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 =
@@ skipping 28 matching lines @@
 
   // The exo display instance. Not owned.
   Display* const display_;
 
   // The identifier associated with the observed display.
   const int64_t display_id_;
 
   // The remote shell resource associated with observer.
   wl_resource* const remote_shell_resource_;
 
+  bool send_configure_after_layout_change_ = false;
+
+  base::WeakPtrFactory<WaylandRemoteShell> weak_ptr_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(WaylandRemoteShell);
 };
 
 void remote_shell_destroy(wl_client* client, wl_resource* resource) {
   // Nothing to do here.
 }
 
 int RemoteSurfaceContainer(uint32_t container) {
   switch (container) {
     case ZWP_REMOTE_SHELL_V1_CONTAINER_DEFAULT:
@@ skipping 1196 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