change the way windows are parented when their parent is set to NULL.

views/widget/native_widget_aura.cc

 // Copyright (c) 2011 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 "views/widget/native_widget_aura.h"
 
 #include "base/bind.h"
 #include "ui/aura/desktop.h"
 #include "ui/aura/event.h"
 #include "ui/aura/window.h"
+#include "ui/aura/window_types.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/compositor/layer.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/screen.h"
 #include "views/widget/native_widget_delegate.h"
 
 #if defined(OS_WIN)
 #include "base/win/scoped_gdi_object.h"
 #include "base/win/win_util.h"
 #include "ui/base/l10n/l10n_util_win.h"
 #endif
 
 #if defined(HAVE_IBUS)
 #include "views/ime/input_method_ibus.h"
 #else
 #include "views/ime/mock_input_method.h"
 #endif
 
 namespace views {
 
+namespace {
+
+int GetAuraWindowTypeForWidgetType(Widget::InitParams::Type type) {
+  switch (type) {
+    case Widget::InitParams::TYPE_WINDOW:
+    case Widget::InitParams::TYPE_WINDOW_FRAMELESS:
+    case Widget::InitParams::TYPE_POPUP:
+    case Widget::InitParams::TYPE_BUBBLE:
+      return aura::kWindowType_Toplevel;
+    case Widget::InitParams::TYPE_CONTROL:
+      return aura::kWindowType_Control;
+    case Widget::InitParams::TYPE_MENU:
+      return aura::kWindowType_Menu;
+    case Widget::InitParams::TYPE_TOOLTIP:
+      return aura::kWindowType_Tooltip;
+    default:
+      NOTREACHED();
+      break;
+  }
+  return aura::kWindowType_Toplevel;
+}
+
+}  // namespace
+
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetAura, public:
 
 NativeWidgetAura::NativeWidgetAura(internal::NativeWidgetDelegate* delegate)
     : delegate_(delegate),
       ALLOW_THIS_IN_INITIALIZER_LIST(window_(new aura::Window(this))),
       ownership_(Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET),
       ALLOW_THIS_IN_INITIALIZER_LIST(close_widget_factory_(this)),
       can_activate_(true),
       cursor_(NULL) {
@@ skipping 18 matching lines @@
   return gfx::Font();
 #endif
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetAura, internal::NativeWidgetPrivate implementation:
 
 void NativeWidgetAura::InitNativeWidget(const Widget::InitParams& params) {
   ownership_ = params.ownership;
   window_->set_user_data(this);
+  window_->SetType(GetAuraWindowTypeForWidgetType(params.type));
   window_->Init();
   // TODO(beng): respect |params| authoritah wrt transparency.
   window_->layer()->SetFillsBoundsOpaquely(false);
   delegate_->OnNativeWidgetCreated();
   window_->SetBounds(params.bounds);
-  window_->SetParent(params.parent);
+  window_->SetParent(
+      params.type == Widget::InitParams::TYPE_MENU ? NULL : params.parent);
   // TODO(beng): do this some other way.
   delegate_->OnNativeWidgetSizeChanged(params.bounds.size());
   can_activate_ = params.can_activate;
 }
 
 NonClientFrameView* NativeWidgetAura::CreateNonClientFrameView() {
   NOTIMPLEMENTED();
   return NULL;
 }
 
@@ skipping 454 matching lines @@
 }
 
 // static
 NativeWidgetPrivate* NativeWidgetPrivate::GetTopLevelNativeWidget(
     gfx::NativeView native_view) {
   if (!native_view)
     return NULL;
   aura::Window* toplevel = native_view;
   aura::Window* parent = native_view->parent();
   while (parent) {
-    if (parent->IsToplevelWindowContainer())
+    if (parent->AsToplevelWindowContainer())
       return GetNativeWidgetForNativeView(toplevel);
     toplevel = parent;
     parent = parent->parent();
   }
   return NULL;
 }
 
 // static
 void NativeWidgetPrivate::GetAllChildWidgets(gfx::NativeView native_view,
                                              Widget::Widgets* children) {
@@ skipping 22 matching lines @@
 }
 
 // static
 bool NativeWidgetPrivate::IsMouseButtonDown() {
   NOTIMPLEMENTED();
   return false;
 }
 
 }  // namespace internal
 }  // namespace views