chromeos: converts WindowState to aura::Window

ash/frame/custom_frame_view_ash.cc

 // Copyright (c) 2012 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 "ash/frame/custom_frame_view_ash.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
@@ skipping 35 matching lines @@
                                         CustomFrameViewAsh* custom_frame_view,
                                         bool enable_immersive)
       : window_state_(nullptr) {
     // Add a window state observer to exit fullscreen properly in case
     // fullscreen is exited without going through
     // WindowState::ToggleFullscreen(). This is the case when exiting
     // immersive fullscreen via the "Restore" window control.
     // TODO(pkotwicz): This is a hack. Remove ASAP. http://crbug.com/319048
     window_state_ = window_state;
     window_state_->AddObserver(this);
-    window_state_->window()->aura_window()->AddObserver(this);
+    window_state_->window()->AddObserver(this);
 
     if (!enable_immersive)
       return;
 
     immersive_fullscreen_controller_ =
         ShellPort::Get()->CreateImmersiveFullscreenController();
     if (immersive_fullscreen_controller_) {
       custom_frame_view->InitImmersiveFullscreenControllerForView(
           immersive_fullscreen_controller_.get());
     }
   }
   ~CustomFrameViewAshWindowStateDelegate() override {
     if (window_state_) {
       window_state_->RemoveObserver(this);
-      window_state_->window()->aura_window()->RemoveObserver(this);
+      window_state_->window()->RemoveObserver(this);
     }
   }
 
  private:
   // Overridden from wm::WindowStateDelegate:
   bool ToggleFullscreen(wm::WindowState* window_state) override {
     bool enter_fullscreen = !window_state->IsFullscreen();
-    if (enter_fullscreen)
-      window_state_->window()->SetShowState(ui::SHOW_STATE_FULLSCREEN);
-    else
+    if (enter_fullscreen) {
+      window_state_->window()->SetProperty(aura::client::kShowStateKey,
+                                           ui::SHOW_STATE_FULLSCREEN);
+    } else {
       window_state->Restore();
+    }
     if (immersive_fullscreen_controller_) {
       immersive_fullscreen_controller_->SetEnabled(
           ImmersiveFullscreenController::WINDOW_TYPE_OTHER, enter_fullscreen);
     }
     return true;
   }
   // Overridden from aura::WindowObserver:
   void OnWindowDestroying(aura::Window* window) override {
     window_state_->RemoveObserver(this);
     window->RemoveObserver(this);
@@ skipping 12 matching lines @@
 
   wm::WindowState* window_state_;
   std::unique_ptr<ImmersiveFullscreenController>
       immersive_fullscreen_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(CustomFrameViewAshWindowStateDelegate);
 };
 
 }  // namespace
 
+// static
+bool CustomFrameViewAsh::use_empty_minimum_size_for_test_ = false;
+
 ///////////////////////////////////////////////////////////////////////////////
 // CustomFrameViewAsh::OverlayView
 
 // View which takes up the entire widget and contains the HeaderView. HeaderView
 // is a child of OverlayView to avoid creating a larger texture than necessary
 // when painting the HeaderView to its own layer.
 class CustomFrameViewAsh::OverlayView : public views::View,
                                         public views::ViewTargeterDelegate {
  public:
   explicit OverlayView(HeaderView* header_view);
@@ skipping 187 matching lines @@
   WmWindow* frame_window = WmWindow::Get(frame_->GetNativeWindow());
   frame_window->aura_window()->SetProperty(aura::client::kTopViewInset,
                                            NonClientTopBorderHeight());
 }
 
 const char* CustomFrameViewAsh::GetClassName() const {
   return kViewClassName;
 }
 
 gfx::Size CustomFrameViewAsh::GetMinimumSize() const {
+  if (use_empty_minimum_size_for_test_)
+    return gfx::Size();
+
   gfx::Size min_client_view_size(frame_->client_view()->GetMinimumSize());
   return gfx::Size(
       std::max(header_view_->GetMinimumWidth(), min_client_view_size.width()),
       NonClientTopBorderHeight() + min_client_view_size.height());
 }
 
 gfx::Size CustomFrameViewAsh::GetMaximumSize() const {
   gfx::Size max_client_size(frame_->client_view()->GetMaximumSize());
   int width = 0;
   int height = 0;
@@ skipping 48 matching lines @@
 FrameCaptionButtonContainerView*
 CustomFrameViewAsh::GetFrameCaptionButtonContainerViewForTest() {
   return header_view_->caption_button_container();
 }
 
 int CustomFrameViewAsh::NonClientTopBorderHeight() const {
   return frame_->IsFullscreen() ? 0 : header_view_->GetPreferredHeight();
 }
 
 }  // namespace ash