Makes WorkspaceLayoutManager use ash/wm/common types

ash/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/wm/maximize_mode/workspace_backdrop_delegate.h"
 
 #include "ash/wm/window_animations.h"
 #include "ash/wm/window_util.h"
+#include "ash/wm/workspace/workspace_layout_manager_backdrop_delegate.h"
 #include "base/auto_reset.h"
 #include "ui/aura/window.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 aura::WindowObserver {
+ public:
+  explicit WindowObserverImpl(WorkspaceBackdropDelegate* delegate)
+      : delegate_(delegate) {}
+  ~WindowObserverImpl() override {}
+
+ private:
+  // 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);
+};
+
 WorkspaceBackdropDelegate::WorkspaceBackdropDelegate(aura::Window* container)
-    : background_(NULL),
+    : container_observer_(new WindowObserverImpl(this)),
+      background_(nullptr),
       container_(container),
       in_restacking_(false) {
   background_ = new views::Widget;
   views::Widget::InitParams params(
       views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
   params.parent = container_;
   params.bounds = container_->GetBoundsInScreen();
   params.layer_type = ui::LAYER_SOLID_COLOR;
   // To disallow the MRU list from picking this window up it should not be
   // activateable.
   params.activatable = views::Widget::InitParams::ACTIVATABLE_NO;
   background_->Init(params);
   // Do not use the animation system. We don't want the bounds animation and
   // opacity needs to get set to |kBackdropOpacity|.
   ::wm::SetWindowVisibilityAnimationTransition(
       background_->GetNativeView(),
       ::wm::ANIMATE_NONE);
   background_->GetNativeView()->SetName("WorkspaceBackdropDelegate");
   background_->GetNativeView()->layer()->SetColor(SK_ColorBLACK);
   // Make sure that the layer covers visibly everything - including the shelf.
   background_->GetNativeView()->layer()->SetBounds(params.bounds);
   Show();
   RestackBackdrop();
-  container_->AddObserver(this);
+  container_->AddObserver(container_observer_.get());
 }
 
 WorkspaceBackdropDelegate::~WorkspaceBackdropDelegate() {
-  container_->RemoveObserver(this);
+  container_->RemoveObserver(container_observer_.get());
   ::wm::ScopedHidingAnimationSettings hiding_settings(
       background_->GetNativeView());
   background_->Close();
   background_->GetNativeView()->layer()->SetOpacity(0.0f);
 }
 
-void WorkspaceBackdropDelegate::OnWindowBoundsChanged(
-    aura::Window* window,
-    const gfx::Rect& old_bounds,
-    const gfx::Rect& new_bounds) {
-  // The container size has changed and the layer needs to be adapt to it.
-  AdjustToContainerBounds();
-}
-
-void WorkspaceBackdropDelegate::OnWindowAddedToLayout(aura::Window* child) {
+void WorkspaceBackdropDelegate::OnWindowAddedToLayout(wm::WmWindow* child) {
   RestackBackdrop();
 }
 
-void WorkspaceBackdropDelegate::OnWindowRemovedFromLayout(aura::Window* child) {
+void WorkspaceBackdropDelegate::OnWindowRemovedFromLayout(wm::WmWindow* child) {
   RestackBackdrop();
 }
 
 void WorkspaceBackdropDelegate::OnChildWindowVisibilityChanged(
-    aura::Window* child,
+    wm::WmWindow* child,
     bool visible) {
   RestackBackdrop();
 }
 
-void WorkspaceBackdropDelegate::OnWindowStackingChanged(aura::Window* window) {
+void WorkspaceBackdropDelegate::OnWindowStackingChanged(wm::WmWindow* window) {
   RestackBackdrop();
 }
 
 void WorkspaceBackdropDelegate::OnPostWindowStateTypeChange(
     wm::WindowState* window_state,
     wm::WindowStateType old_type) {
   RestackBackdrop();
 }
 
 void WorkspaceBackdropDelegate::OnDisplayWorkAreaInsetsChanged() {
@@ skipping 60 matching lines @@
 
 void WorkspaceBackdropDelegate::Show() {
   background_->GetNativeView()->layer()->SetOpacity(0.0f);
   background_->Show();
   ui::ScopedLayerAnimationSettings settings(
       background_->GetNativeView()->layer()->GetAnimator());
   background_->GetNativeView()->layer()->SetOpacity(kBackdropOpacity);
 }
 
 }  // namespace ash