Fix for tab re-attach on windows desktop aura

chrome/browser/ui/views/tabs/dock_info_win.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/tabs/dock_info.h"
 
 #include "base/win/scoped_gdi_object.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/ui/ash/tabs/dock_info_ash.h"
 #include "chrome/browser/ui/browser_list.h"
@@ skipping 288 matching lines @@
   gfx::Point screen_loc_;
 
   // The resulting DockInfo.
   DockInfo result_;
 
   DISALLOW_COPY_AND_ASSIGN(DockToWindowFinder);
 };
 
 std::set<HWND> RemapIgnoreSet(const std::set<gfx::NativeView>& ignore) {
 #if defined(USE_AURA)
-  // TODO(scottmg): Figure out how to reimplement |ignore| on Aura. The ignore
-  // in BaseWindowFinder is via EnumThreadWindows, but the NativeViews won't
-  // be enumerated on Aura.
-  return std::set<HWND>();
+  std::set<HWND> hwnd_set;
+  std::set<gfx::NativeView>::const_iterator it = ignore.begin();
+  for (; it != ignore.end(); ++it) {
+    HWND w = (*it)->GetRootWindow()->GetAcceleratedWidget();
+    if (w)
+      hwnd_set.insert(w);
+  }
+  return hwnd_set;
 #else
   // NativeViews are already HWNDs on non-Aura Windows.
   return ignore;
 #endif
 }
 
 }  // namespace
 
 // DockInfo -------------------------------------------------------------------
 
@@ skipping 74 matching lines @@
   SetWindowPos(window(), HWND_TOP, bounds.x(), bounds.y(), bounds.width(),
                bounds.height(), SWP_NOACTIVATE | SWP_NOOWNERZORDER);
 }
 
 // static
 int DockInfo::GetHotSpotDeltaY() {
   return Tab::GetMinimumUnselectedSize().height() - 1;
 }
 
 #endif  // !USE_AURA