| Index: ash/wm/drag_window_controller.cc
|
| diff --git a/ash/wm/drag_window_controller.cc b/ash/wm/drag_window_controller.cc
|
| index a494df0984d76cf9c8302b60e85478405e990062..fb6bc25cf677e44f7384d95fd00d60a68bc4538a 100644
|
| --- a/ash/wm/drag_window_controller.cc
|
| +++ b/ash/wm/drag_window_controller.cc
|
| @@ -133,11 +133,11 @@ class DragWindowController::DragWindowDetails
|
| }
|
|
|
| // aura::WindowDelegate:
|
| - ui::LayerDelegate* CreateDelegate(ui::LayerDelegate* delegate) override {
|
| - if (!delegate)
|
| + ui::LayerDelegate* CreateDelegate(ui::Layer* foo, ui::Layer* layer) override {
|
| + if (!layer || !layer->delegate())
|
| return nullptr;
|
| - wm::ForwardingLayerDelegate* new_delegate = new wm::ForwardingLayerDelegate(
|
| - WmWindowAura::Get(original_window_), delegate);
|
| + wm::ForwardingLayerDelegate* new_delegate =
|
| + new wm::ForwardingLayerDelegate(foo, layer);
|
| delegates_.push_back(base::WrapUnique(new_delegate));
|
| return new_delegate;
|
| }
|
|
|