Revert 139494 - ash: Improved window maximize/restore animations

ash/wm/workspace/workspace_manager.h

Index: ash/wm/workspace/workspace_manager.h
===================================================================
--- ash/wm/workspace/workspace_manager.h	(revision 139956)
+++ ash/wm/workspace/workspace_manager.h	(working copy)
@@ -76,6 +76,10 @@
   // Returns the bounds in which a window can be moved/resized.
   gfx::Rect GetDragAreaBounds();
 
+  // Returns the window the layout manager should allow the size to be set for.
+  // TODO: maybe this should be set on WorkspaceLayoutManager.
+  aura::Window* ignored_window() { return ignored_window_; }
+
   // Sets the size of the grid. Newly added windows are forced to align to the
   // size of the grid.
   void set_grid_size(int size) { grid_size_ = size; }
@@ -102,6 +106,11 @@
   friend class Workspace;
   friend class WorkspaceManagerTest;
 
+  // See description above getter.
+  void set_ignored_window(aura::Window* ignored_window) {
+    ignored_window_ = ignored_window;
+  }
+
   void AddWorkspace(Workspace* workspace);
   void RemoveWorkspace(Workspace* workspace);
 
@@ -153,9 +162,8 @@
 
   std::vector<Workspace*> workspaces_;
 
-  // Window being maximized or restored during a workspace type change.
-  // It has its own animation and is ignored by workspace show/hide animations.
-  aura::Window* maximize_restore_window_;
+  // The window that WorkspaceManager does not set the bounds on.
+  aura::Window* ignored_window_;
 
   // See description above setter.
   int grid_size_;