exo: ShellSurface: Remove the CustomWindowStateDelegate

components/exo/shell_surface.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/shell_surface.h"
 
 #include <algorithm>
 
 #include "ash/common/frame/custom_frame_view_ash.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/wm/window_resizer.h"
 #include "ash/common/wm/window_state.h"
-#include "ash/common/wm/window_state_delegate.h"
 #include "ash/common/wm_window.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/trace_event/trace_event.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "components/exo/surface.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_targeter.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/class_property.h"
 #include "ui/gfx/path.h"
 #include "ui/views/widget/widget.h"
-#include "ui/views/widget/widget_observer.h"
 #include "ui/wm/core/coordinate_conversion.h"
 #include "ui/wm/core/shadow.h"
 #include "ui/wm/core/shadow_controller.h"
 #include "ui/wm/core/shadow_types.h"
 #include "ui/wm/core/window_animations.h"
 #include "ui/wm/core/window_util.h"
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/audio/chromeos_sounds.h"
 #endif
@@ skipping 92 matching lines @@
     }
     return aura::WindowTargeter::FindTargetForEvent(root, event);
   }
 
  private:
   views::Widget* const widget_;
 
   DISALLOW_COPY_AND_ASSIGN(CustomWindowTargeter);
 };
 
-// Handles a user's fullscreen request (Shift+F4/F4).
-class CustomWindowStateDelegate : public ash::wm::WindowStateDelegate,

[oshima, 2017/02/09 00:37:01]

I believe we still need this to go fullscreen using F4 key and set the immersive
flag.

-                                  public views::WidgetObserver {
- public:
-  explicit CustomWindowStateDelegate(views::Widget* widget) : widget_(widget) {
-    widget_->AddObserver(this);
-  }
-  ~CustomWindowStateDelegate() override {
-    if (widget_)
-      widget_->RemoveObserver(this);
-  }
-
-  // Overridden from ash::wm::WindowStateDelegate:
-  bool ToggleFullscreen(ash::wm::WindowState* window_state) override {
-    if (widget_) {
-      bool enter_fullscreen = !window_state->IsFullscreen();
-      widget_->SetFullscreen(enter_fullscreen);
-      ash::wm::WindowState* window_state =
-          ash::wm::GetWindowState(widget_->GetNativeWindow());
-      window_state->set_in_immersive_fullscreen(enter_fullscreen);
-    }
-    return true;
-  }
-
-  // Overridden from views::WidgetObserver:
-  void OnWidgetDestroying(views::Widget* widget) override {
-    widget_->RemoveObserver(this);
-    widget_ = nullptr;
-  }
-
- private:
-  views::Widget* widget_;
-
-  DISALLOW_COPY_AND_ASSIGN(CustomWindowStateDelegate);
-};
-
 class ShellSurfaceWidget : public views::Widget {
  public:
   explicit ShellSurfaceWidget(ShellSurface* shell_surface)
       : shell_surface_(shell_surface) {}
 
   // Overridden from views::Widget
   void Close() override { shell_surface_->Close(); }
   void OnKeyEvent(ui::KeyEvent* event) override {
     // TODO(hidehiko): Handle ESC + SHIFT + COMMAND accelerator key
     // to escape pinned mode.
@@ skipping 632 matching lines @@
   return widget_;
 }
 
 views::View* ShellSurface::GetContentsView() {
   return this;
 }
 
 views::NonClientFrameView* ShellSurface::CreateNonClientFrameView(
     views::Widget* widget) {
   aura::Window* window = widget_->GetNativeWindow();
-  ash::wm::WindowState* window_state = ash::wm::GetWindowState(window);
-  // Set delegate for handling of fullscreening.
-  window_state->SetDelegate(std::unique_ptr<ash::wm::WindowStateDelegate>(
-      new CustomWindowStateDelegate(widget_)));
-
+  window->SetProperty(aura::client::kImmersiveFullscreenKey, true);

[oshima, 2017/02/09 19:38:59]

Please add comment that we assume the exo windows is always immersive (unlike
browser window which can become both).

[Peng, 2017/02/10 16:03:57]

Done.

   if (frame_enabled_)
     return new ash::CustomFrameViewAsh(widget);
 
   return new CustomFrameView(widget);
 }
 
 bool ShellSurface::WidgetHasHitTestMask() const {
   return surface_ ? surface_->HasHitTestMask() : false;
 }
 
@@ skipping 659 matching lines @@
     // small style shadow for them.
     if (!activatable_)
       shadow->SetElevation(wm::ShadowElevation::SMALL);
     // We don't have rounded corners unless frame is enabled.
     if (!frame_enabled_)
       shadow->SetRoundedCornerRadius(0);
   }
 }
 
 }  // namespace exo