Generalize layer mirroring for phantom windows

ash/common/wm/forwarding_layer_delegate.h

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 7c68f185a10d658c7b92e6e7f58c15bc8fcb7d9c..dda131bcae7c2155606d84923a212e8c997a72db 100644
--- a/ash/common/wm/forwarding_layer_delegate.h
+++ b/ash/common/wm/forwarding_layer_delegate.h
@@ -15,9 +15,6 @@ class Layer;
 }
 
 namespace ash {
-
-class WmWindow;
-
 namespace wm {
 
 // A layer delegate to paint the content of a recreated layer by delegating
@@ -26,7 +23,7 @@ namespace wm {
 class ForwardingLayerDelegate : public ui::LayerDelegate,
                                 public ui::LayerObserver {
  public:
-  ForwardingLayerDelegate(ui::Layer* new_layer, ui::Layer* original_layer);

[sky, 2016/10/13 19:21:33]

In the context of the constructor client_layer doesn't mean anything. Please
leave it as new_layer. In the context of the class I would be tempted to rename
client_layer_ to layer_.

[Dominik Laskowski, 2016/10/13 22:19:39]

I was going for consistency, but I agree. new_layer and layer_ it is.

+  ForwardingLayerDelegate(ui::Layer* client_layer, ui::Layer* original_layer);
   ~ForwardingLayerDelegate() override;
 
   // ui:LayerDelegate:
@@ -36,14 +33,13 @@ class ForwardingLayerDelegate : public ui::LayerDelegate,
 
   // ui::LayerObserver:
   void DidPaintLayer(ui::Layer* layer, const gfx::Rect& rect) override;
-  void SurfaceChanged(ui::Layer* layer) override;
   void LayerDestroyed(ui::Layer* layer) override;
 
  private:
   // 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_;