Replace WmWindowObserver with aura::WindowObserver.

ash/common/wm/maximize_mode/workspace_backdrop_delegate.cc

 // Copyright 2014 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/wm/maximize_mode/workspace_backdrop_delegate.h"
 
 #include "ash/common/wm/workspace/workspace_layout_manager_backdrop_delegate.h"
 #include "ash/common/wm_lookup.h"
 #include "ash/common/wm_window.h"
-#include "ash/common/wm_window_observer.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
 #include "base/auto_reset.h"
+#include "ui/aura/window_observer.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/views/background.h"
 #include "ui/views/widget/widget.h"
 #include "ui/wm/core/window_animations.h"
 #include "ui/wm/core/window_util.h"
 
 namespace ash {
 namespace {
 
 // The opacity of the backdrop.
 const float kBackdropOpacity = 0.5f;
 
 }  // namespace
 
-class WorkspaceBackdropDelegate::WindowObserverImpl : public WmWindowObserver {
+class WorkspaceBackdropDelegate::WindowObserverImpl
+    : public aura::WindowObserver {
  public:
   explicit WindowObserverImpl(WorkspaceBackdropDelegate* delegate)
       : delegate_(delegate) {}
   ~WindowObserverImpl() override {}
 
  private:
-  // WmWindowObserver overrides:
-  void OnWindowBoundsChanged(WmWindow* window,
+  // aura::WindowObserver overrides:
+  void OnWindowBoundsChanged(aura::Window* window,
                              const gfx::Rect& old_bounds,
                              const gfx::Rect& new_bounds) override {
     // The container size has changed and the layer needs to be adapt to it.
     delegate_->AdjustToContainerBounds();
   }
 
   WorkspaceBackdropDelegate* delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowObserverImpl);
 };
@@ skipping 18 matching lines @@
   background_window_ = WmLookup::Get()->GetWindowForWidget(background_);
   // Do not use the animation system. We don't want the bounds animation and
   // opacity needs to get set to |kBackdropOpacity|.
   background_window_->SetVisibilityAnimationTransition(::wm::ANIMATE_NONE);
   background_window_->GetLayer()->SetColor(SK_ColorBLACK);
   // Make sure that the layer covers visibly everything - including the shelf.
   background_window_->GetLayer()->SetBounds(params.bounds);
   DCHECK(background_window_->GetBounds() == params.bounds);
   Show();
   RestackBackdrop();
-  container_->AddObserver(container_observer_.get());
+  container_->aura_window()->AddObserver(container_observer_.get());
 }
 
 WorkspaceBackdropDelegate::~WorkspaceBackdropDelegate() {
-  container_->RemoveObserver(container_observer_.get());
+  container_->aura_window()->RemoveObserver(container_observer_.get());
   // TODO: animations won't work right with mus: http://crbug.com/548396.
   ::wm::ScopedHidingAnimationSettings hiding_settings(
       background_->GetNativeView());
   background_->Close();
   background_window_->GetLayer()->SetOpacity(0.0f);
 }
 
 void WorkspaceBackdropDelegate::OnWindowAddedToLayout(WmWindow* child) {
   RestackBackdrop();
 }
@@ skipping 77 matching lines @@
 
 void WorkspaceBackdropDelegate::Show() {
   background_window_->GetLayer()->SetOpacity(0.0f);
   background_->Show();
   ui::ScopedLayerAnimationSettings settings(
       background_window_->GetLayer()->GetAnimator());
   background_window_->GetLayer()->SetOpacity(kBackdropOpacity);
 }
 
 }  // namespace ash