Adds OnChildWindowVisibilityChanged to ui::WindowObserver

ash/mus/bridge/mus_layout_manager_adapter.h

 // Copyright 2016 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.
 
 #ifndef ASH_MUS_BRIDGE_MUS_LAYOUT_MANAGER_ADAPTER_H_
 #define ASH_MUS_BRIDGE_MUS_LAYOUT_MANAGER_ADAPTER_H_
 
 #include <memory>
 
 #include "base/macros.h"
@@ skipping 16 matching lines @@
 // ensures WmLayoutManager::SetChildBounds() is called appropriately.
 class MusLayoutManagerAdapter : public ui::WindowObserver {
  public:
   MusLayoutManagerAdapter(ui::Window* window,
                           std::unique_ptr<WmLayoutManager> layout_manager);
   ~MusLayoutManagerAdapter() override;
 
   WmLayoutManager* layout_manager() { return layout_manager_.get(); }
 
  private:
-  // WindowObserver attached to child windows. A separate class is used to
-  // easily differentiate WindowObserver calls on the ui::Window associated
-  // with the MusLayoutManagerAdapter, vs children.
-  class ChildWindowObserver : public ui::WindowObserver {
-   public:
-    explicit ChildWindowObserver(MusLayoutManagerAdapter* adapter);
-    ~ChildWindowObserver() override;
-
-   private:
-    // ui::WindowObserver:
-    void OnWindowVisibilityChanged(ui::Window* window) override;
-
-    MusLayoutManagerAdapter* adapter_;
-
-    DISALLOW_COPY_AND_ASSIGN(ChildWindowObserver);
-  };
-
   // ui::WindowObserver:
   void OnTreeChanging(const TreeChangeParams& params) override;
   void OnTreeChanged(const TreeChangeParams& params) override;
   void OnWindowBoundsChanged(ui::Window* window,
                              const gfx::Rect& old_bounds,
                              const gfx::Rect& new_bounds) override;
+  void OnChildWindowVisibilityChanged(ui::Window* window,
+                                      bool visible) override;
 
   ui::Window* window_;
-  ChildWindowObserver child_window_observer_;
   std::unique_ptr<WmLayoutManager> layout_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(MusLayoutManagerAdapter);
 };
 
 }  // namespace mus
 }  // namespace ash
 
 #endif  // ASH_MUS_BRIDGE_MUS_LAYOUT_MANAGER_ADAPTER_H_