Reworks the workspace code. Here's the new heuristics:

ash/wm/show_state_controller.cc

Index: ash/wm/show_state_controller.cc
diff --git a/ash/wm/show_state_controller.cc b/ash/wm/show_state_controller.cc
deleted file mode 100644
index 9b670c784f2cc1f44621d6745a8d312377a5ce9f..0000000000000000000000000000000000000000
--- a/ash/wm/show_state_controller.cc
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) 2011 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.
-
-#include "ash/wm/show_state_controller.h"
-
-#include "ash/wm/property_util.h"
-#include "ash/wm/workspace/workspace.h"
-#include "ash/wm/workspace/workspace_manager.h"
-#include "ui/aura/client/aura_constants.h"
-#include "ui/aura/window.h"
-#include "ui/base/ui_base_types.h"
-
-namespace ash {
-namespace internal {
-
-ShowStateController::ShowStateController(
-    WorkspaceManager* workspace_manager)
-    : workspace_manager_(workspace_manager) {
-}
-
-ShowStateController::~ShowStateController() {
-}
-
-void ShowStateController::OnWindowPropertyChanged(aura::Window* window,
-                                                  const char* name,
-                                                  void* old) {
-  if (name != aura::client::kShowStateKey)
-    return;
-  if (window->GetIntProperty(name) == ui::SHOW_STATE_NORMAL) {
-    // Restore the size of window first, then let Workspace layout the window.
-    const gfx::Rect* restore = GetRestoreBounds(window);
-    window->SetProperty(aura::client::kRestoreBoundsKey, NULL);
-    if (restore)
-      window->SetBounds(*restore);
-    delete restore;
-  } else if (old == reinterpret_cast<void*>(ui::SHOW_STATE_NORMAL)) {
-    // Store the restore bounds only if previous state is normal.
-    DCHECK(window->GetProperty(aura::client::kRestoreBoundsKey) == NULL);
-    SetRestoreBounds(window, window->GetTargetBounds());
-  }
-
-  workspace_manager_->FindBy(window)->Layout(window);
-}
-
-}  // namespace internal
-}  // namespace ash