Merge 260031 "Fix infinite recursion on hiding panel when create..."

ash/wm/panels/panel_layout_manager.h

Index: ash/wm/panels/panel_layout_manager.h
===================================================================
--- ash/wm/panels/panel_layout_manager.h	(revision 262842)
+++ ash/wm/panels/panel_layout_manager.h	(working copy)
@@ -19,7 +19,6 @@
 #include "base/memory/weak_ptr.h"
 #include "ui/aura/client/activation_change_observer.h"
 #include "ui/aura/layout_manager.h"
-#include "ui/aura/window_observer.h"
 #include "ui/keyboard/keyboard_controller.h"
 #include "ui/keyboard/keyboard_controller_observer.h"
 
@@ -56,7 +55,6 @@
     : public aura::LayoutManager,
       public ShelfIconObserver,
       public ShellObserver,
-      public aura::WindowObserver,
       public aura::client::ActivationChangeObserver,
       public keyboard::KeyboardControllerObserver,
       public DisplayController::Observer,
@@ -100,10 +98,6 @@
   virtual void OnPostWindowShowTypeChange(wm::WindowState* window_state,
                                           wm::WindowShowType old_type) OVERRIDE;
 
-  // Overridden from aura::WindowObserver
-  virtual void OnWindowVisibilityChanged(aura::Window* window,
-                                         bool visible) OVERRIDE;
-
   // Overridden from aura::client::ActivationChangeObserver
   virtual void OnWindowActivated(aura::Window* gained_active,
                                  aura::Window* lost_active) OVERRIDE;