Minor style cleanup in DockedWindowLayoutManager

ash/wm/dock/docked_window_layout_manager.h

 // Copyright (c) 2013 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_WM_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_H_
 #define ASH_WM_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_H_
 
 #include <memory>
 
 #include "ash/ash_export.h"
@@ skipping 24 matching lines @@
 class Widget;
 }
 
 namespace ash {
 class DockedBackgroundWidget;
 class DockedWindowLayoutManagerObserver;
 class DockedWindowResizerTest;
 class Shelf;
 class WorkspaceController;
 
-struct WindowWithHeight {
-  explicit WindowWithHeight(aura::Window* window) :
-    window_(window),
-    height_(window->bounds().height()) { }
-  aura::Window* window() { return window_; }
-  const aura::Window* window() const { return window_; }
-  aura::Window* window_;
-  int height_;
-};
-
 // DockedWindowLayoutManager is responsible for organizing windows when they are
 // docked to the side of a screen. It is associated with a specific container
 // window (i.e. kShellWindowId_DockContainer) and controls the layout of any
 // windows added to that container.
 //
 // The constructor takes a |dock_container| argument which is expected to set
 // its layout manager to this instance, e.g.:
 // dock_container->SetLayoutManager(
 //     new DockedWindowLayoutManager(dock_container));
 //
@@ skipping 106 matching lines @@
   void OnWindowVisibilityChanging(aura::Window* window, bool visible) override;
   void OnWindowDestroying(aura::Window* window) override;
 
   // aura::client::ActivationChangeObserver:
   void OnWindowActivated(
       aura::client::ActivationChangeObserver::ActivationReason reason,
       aura::Window* gained_active,
       aura::Window* lost_active) override;
 
  private:
+  struct CompareMinimumHeight;
+  struct CompareWindowPos;
   class ShelfWindowObserver;
+  struct WindowWithHeight;
+
   friend class DockedWindowLayoutManagerTest;
   friend class DockedWindowResizerTest;
 
   // Width of the gap between the docked windows and a workspace.
   static const int kMinDockGap;
 
   // Ideal (starting) width of the dock.
   static const int kIdealWidth;
 
   // Returns the alignment of the docked windows other than the |child|.
@@ skipping 128 matching lines @@
 
   // Observers of dock bounds changes.
   base::ObserverList<DockedWindowLayoutManagerObserver> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(DockedWindowLayoutManager);
 };
 
 }  // namespace ash
 
 #endif  // ASH_WM_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_H_