make menus, bubbles, etc. top level windows on aura

chrome/browser/ui/views/chrome_views_delegate.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/chrome_views_delegate.h"
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "base/string_util.h"
@@ skipping 196 matching lines @@
         break;
 #if defined(USE_ASH)
       case chrome::HOST_DESKTOP_TYPE_ASH:
         // If we're in ash, give this window the context of the main monitor.
         params->context = ash::Shell::GetPrimaryRootWindow();
         break;
 #endif
       default:
         NOTREACHED();
     }
+#if defined(OS_WIN) && defined(USE_AURA)
+  } else if (chrome::GetActiveDesktop() != chrome::HOST_DESKTOP_TYPE_ASH &&
+             params->parent &&
+             (params->type == views::Widget::InitParams::TYPE_CONTROL ||
+              params->type == views::Widget::InitParams::TYPE_WINDOW)) {
+    // On Aura Desktop, we want most windows (popups, bubbles, regular top
+    // level windows) not to be handled in this function. They'll get a
+    // DesktopNativeWidgetAura created. For controls, and child windows (e.g.
+    // modal dialogs) we want to create a NativeWidgetAura, which will be
+    // inside the parent.
+#else
   } else if (params->parent &&
              params->type != views::Widget::InitParams::TYPE_MENU) {
+#endif
     params->native_widget = new views::NativeWidgetAura(delegate);
   } else if (params->type != views::Widget::InitParams::TYPE_TOOLTIP) {
     // TODO(erg): Once we've threaded context to everywhere that needs it, we
     // should remove this check here.
     gfx::NativeView to_check =
         params->context ? params->context : params->parent;
     if (chrome::GetHostDesktopTypeForNativeView(to_check) ==
         chrome::HOST_DESKTOP_TYPE_NATIVE) {
       params->native_widget = new views::DesktopNativeWidgetAura(delegate);
     }
   }
 #endif
 }