| Index: ash/common/wm/forwarding_layer_delegate.h
|
| diff --git a/ash/common/wm/forwarding_layer_delegate.h b/ash/common/wm/forwarding_layer_delegate.h
|
| index 446db9c747a7f508b2896232ad3e5e8cb59b789e..50667a199c866bd1d9415f4ca9c6eb7cd6c5e670 100644
|
| --- a/ash/common/wm/forwarding_layer_delegate.h
|
| +++ b/ash/common/wm/forwarding_layer_delegate.h
|
| @@ -26,7 +26,9 @@ namespace wm {
|
| class ForwardingLayerDelegate : public ui::LayerDelegate,
|
| public ui::LayerObserver {
|
| public:
|
| - ForwardingLayerDelegate(ui::Layer* new_layer, ui::Layer* original_layer);
|
| + ForwardingLayerDelegate(ui::Layer* client_layer,
|
| + ui::Layer* original_layer,
|
| + bool sync_bounds);
|
| ~ForwardingLayerDelegate() override;
|
|
|
| // ui:LayerDelegate:
|
| @@ -37,6 +39,7 @@ class ForwardingLayerDelegate : public ui::LayerDelegate,
|
|
|
| // ui::LayerObserver:
|
| void DidPaintLayer(ui::Layer* layer, const gfx::Rect& rect) override;
|
| + void BoundsChanged(ui::Layer* layer) override;
|
| void SurfaceChanged(ui::Layer* layer) override;
|
| void LayerDestroyed(ui::Layer* layer) override;
|
|
|
| @@ -44,11 +47,13 @@ class ForwardingLayerDelegate : public ui::LayerDelegate,
|
| // The layer for which |this| is the delegate.
|
| ui::Layer* client_layer_;
|
|
|
| - // The layer that was recreated to replace |new_layer_|.
|
| + // The layer that was recreated to replace |client_layer_|.
|
| ui::Layer* original_layer_;
|
|
|
| ScopedObserver<ui::Layer, ui::LayerObserver> scoped_observer_;
|
|
|
| + const bool sync_bounds_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(ForwardingLayerDelegate);
|
| };
|
|
|
|
|