[Cleanup] Rename WindowSettings to WindowState

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 "ash/ash_export.h"
 #include "ash/shelf/shelf_layout_manager_observer.h"
 #include "ash/shell_observer.h"
 #include "ash/wm/dock/dock_types.h"
-#include "ash/wm/property_util.h"
 #include "ash/wm/workspace/snap_types.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "ui/aura/client/activation_change_observer.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/window_observer.h"
 #include "ui/gfx/rect.h"
@@ skipping 133 matching lines @@
   friend class DockedWindowLayoutManagerTest;
   friend class DockedWindowResizerTest;
 
   // Minimum width of the docked windows area.
   static const int kMinDockWidth;
 
   // Width of the gap between the docked windows and a workspace.
   static const int kMinDockGap;
 
   // Minimize / restore window and relayout.
-  void MinimizeWindow(aura::Window* window);
-  void RestoreWindow(aura::Window* window);
+  void MinimizeDockedWindow(aura::Window* window);
+  void RestoreDockedWindow(aura::Window* window);
 
   // Updates docked layout state when a window gets inside the dock.
   void OnWindowDocked(aura::Window* window);
 
   // Updates docked layout state when a window gets outside the dock.
   void OnWindowUndocked();
 
   // Returns true if there are any windows currently docked.
   bool IsAnyWindowDocked();
 
@@ skipping 60 matching lines @@
   // Observers of dock bounds changes.
   ObserverList<DockedWindowLayoutManagerObserver> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(DockedWindowLayoutManager);
 };
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_WM_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_H_