Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1585)

Unified Diff: chrome/browser/ui/views/tabs/dock_info_win.cc

Issue 11416345: Fix for tab re-attach on windows desktop aura (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/tabs/dock_info_win.cc
===================================================================
--- chrome/browser/ui/views/tabs/dock_info_win.cc (revision 170327)
+++ chrome/browser/ui/views/tabs/dock_info_win.cc (working copy)
@@ -306,10 +306,14 @@
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;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698