Replace WmWindowObserver with aura::WindowObserver.

ash/common/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/common/frame/custom_frame_view_ash.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h"
 #include "ash/common/frame/frame_border_hit_test.h"
 #include "ash/common/frame/header_view.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm/window_state_delegate.h"
 #include "ash/common/wm/window_state_observer.h"
 #include "ash/common/wm_lookup.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
-#include "ash/common/wm_window_observer.h"
 #include "ash/common/wm_window_property.h"
 #include "ash/shared/immersive_fullscreen_controller.h"
 #include "ash/shared/immersive_fullscreen_controller_delegate.h"
+#include "ui/aura/window.h"
+#include "ui/aura/window_observer.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/views/view.h"
 #include "ui/views/view_targeter.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace ash {
 
 namespace {
 
 ///////////////////////////////////////////////////////////////////////////////
 // CustomFrameViewAshWindowStateDelegate
 
 // Handles a user's fullscreen request (Shift+F4/F4). Puts the window into
 // immersive fullscreen if immersive fullscreen is enabled for non-browser
 // windows.
 class CustomFrameViewAshWindowStateDelegate : public wm::WindowStateDelegate,
                                               public wm::WindowStateObserver,
-                                              public WmWindowObserver {
+                                              public aura::WindowObserver {
  public:
   CustomFrameViewAshWindowStateDelegate(wm::WindowState* window_state,
                                         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()->AddObserver(this);
+    window_state_->window()->aura_window()->AddObserver(this);
 
     if (!enable_immersive)
       return;
 
     immersive_fullscreen_controller_ =
         WmShell::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()->RemoveObserver(this);
+      window_state_->window()->aura_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
       window_state->Restore();
     if (immersive_fullscreen_controller_) {
       immersive_fullscreen_controller_->SetEnabled(
           ImmersiveFullscreenController::WINDOW_TYPE_OTHER, enter_fullscreen);
     }
     return true;
   }
-  // Overridden from WmWindowObserver:
-  void OnWindowDestroying(WmWindow* window) override {
+  // Overridden from aura::WindowObserver:
+  void OnWindowDestroying(aura::Window* window) override {
     window_state_->RemoveObserver(this);
     window->RemoveObserver(this);
     window_state_ = nullptr;
   }
   // Overridden from wm::WindowStateObserver:
   void OnPostWindowStateTypeChange(wm::WindowState* window_state,
                                    wm::WindowStateType old_type) override {
     if (!window_state->IsFullscreen() && !window_state->IsMinimized() &&
         immersive_fullscreen_controller_ &&
         immersive_fullscreen_controller_->IsEnabled()) {
@@ skipping 252 matching lines @@
 FrameCaptionButtonContainerView*
 CustomFrameViewAsh::GetFrameCaptionButtonContainerViewForTest() {
   return header_view_->caption_button_container();
 }
 
 int CustomFrameViewAsh::NonClientTopBorderHeight() const {
   return frame_->IsFullscreen() ? 0 : header_view_->GetPreferredHeight();
 }
 
 }  // namespace ash