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

chrome/browser/ui/views/aura/launcher_icon_updater.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 "chrome/browser/ui/views/aura/launcher_icon_updater.h"
 
 #include "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
@@ skipping 92 matching lines @@
 }
 
 // static
 void LauncherIconUpdater::ActivateByID(ash::LauncherID id) {
   TabContentsWrapper* tab = NULL;
   const LauncherIconUpdater* updater = GetLauncherByID(id, &tab);
   if (!updater) {
     NOTREACHED();
     return;
   }
+  updater->window_->Show();
   ash::ActivateWindow(updater->window_);
   if (tab) {
     updater->tab_model_->ActivateTabAt(
         updater->tab_model_->GetIndexOfTabContents(tab), true);
   }
 }
 
 // static
 string16 LauncherIconUpdater::GetTitleByID(ash::LauncherID id) {
   TabContentsWrapper* tab = NULL;
@@ skipping 267 matching lines @@
     return true;
   for (AppTabMap::const_iterator i = app_map_.begin(); i != app_map_.end();
        ++i) {
     if (i->second.id == id) {
       *tab = i->first;
       return true;
     }
   }
   return false;
 }