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

ash/shell/shell_main.cc

 // 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.
 
 #include <map>
 
 #include "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/launcher/launcher_types.h"
 #include "ash/shell.h"
@@ skipping 139 matching lines @@
     aura::Window* default_container = ash::Shell::GetInstance()->GetContainer(
         ash::internal::kShellWindowId_DefaultContainer);
     std::vector<aura::Window*> windows = default_container->children();
     // Window cycling expects the topmost window at the front of the list.
     std::reverse(windows.begin(), windows.end());
     return windows;
   }
 
   virtual void LauncherItemClicked(
       const ash::LauncherItem& item) OVERRIDE {
-    ash::ActivateWindow(watcher_->GetWindowByID(item.id));
+    aura::Window* window = watcher_->GetWindowByID(item.id);
+    window->Show();
+    ash::ActivateWindow(window);
   }
 
   virtual int GetBrowserShortcutResourceId() OVERRIDE {
     return IDR_AURA_LAUNCHER_BROWSER_SHORTCUT;
   }
 
   virtual string16 GetLauncherItemTitle(
       const ash::LauncherItem& item) OVERRIDE {
     return watcher_->GetWindowByID(item.id)->title();
   }
@@ skipping 44 matching lines @@
   window_watcher.reset();
 
   ash::Shell::DeleteInstance();
 
   aura::RootWindow::DeleteInstance();
 
   ui::CompositorTestSupport::Terminate();
 
   return 0;
 }