Revert 139494 - ash: Improved window maximize/restore animations

ash/wm/workspace/workspace_manager.h

 // Copyright (c) 2012 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_WORKSPACE_MANAGER_H_
 #define ASH_WM_WORKSPACE_MANAGER_H_
 
 #include <vector>
 
 #include "ash/ash_export.h"
@@ skipping 58 matching lines @@
   // Returns the Window this WorkspaceManager controls.
   aura::Window* contents_view() { return contents_view_; }
 
   // Returns the window for rotate operation based on the |location|.
   // TODO: this isn't currently used; remove if we do away with overview.
   aura::Window* FindRotateWindowForLocation(const gfx::Point& location);
 
   // 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; }
   int grid_size() const { return grid_size_; }
 
   void set_shelf(ShelfLayoutManager* shelf) { shelf_ = shelf; }
 
   // Updates the visibility and whether any windows overlap the shelf.
   void UpdateShelfVisibility();
 
   // Returns the current window state.
   WindowState GetWindowState();
 
   // Invoked when the show state of the specified window changes.
   void ShowStateChanged(aura::Window* window);
 
  private:
   // Enumeration of whether windows should animate or not.
   enum AnimateChangeType {
     ANIMATE,
     DONT_ANIMATE
   };
 
   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);
 
   // Sets the visibility of the windows in |workspace|.
   void SetVisibilityOfWorkspaceWindows(Workspace* workspace,
                                        AnimateChangeType change_type,
                                        bool value);
 
   // Implementation of SetVisibilityOfWorkspaceWindows().
   void SetWindowLayerVisibility(const std::vector<aura::Window*>& windows,
@@ skipping 31 matching lines @@
 
   // Deletes workspaces of TYPE_MAXIMIZED when they become empty.
   void CleanupWorkspace(Workspace* workspace);
 
   aura::Window* contents_view_;
 
   Workspace* active_workspace_;
 
   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_;
 
   // Owned by the Shell container window LauncherContainer. May be NULL.
   ShelfLayoutManager* shelf_;
 
   DISALLOW_COPY_AND_ASSIGN(WorkspaceManager);
 };
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_WM_WORKSPACE_MANAGER_H_