Index: ui/views/widget/native_widget_aura.cc |
diff --git a/ui/views/widget/native_widget_aura.cc b/ui/views/widget/native_widget_aura.cc |
index b436c8eeeb13e64bcf76829b8827521254693b5f..a7a71687e0d6847e9b2358a003a2d36f197fa18b 100644 |
--- a/ui/views/widget/native_widget_aura.cc |
+++ b/ui/views/widget/native_widget_aura.cc |
@@ -1148,8 +1148,10 @@ void NativeWidgetPrivate::ReparentNativeView(gfx::NativeView native_view, |
// matches our previous behaviour; the global stacking client would almost |
// always reattach the window to the same RootWindow. |
aura::Window* root_window = native_view->GetRootWindow(); |
- aura::client::ParentWindowWithContext( |
- native_view, root_window, root_window->GetBoundsInScreen()); |
+ if (root_window) { |
sky
2014/09/12 21:27:05
This makes me nervous. See big comment above this.
ananta
2014/09/14 01:30:44
As per discussion, added code to show hide the Web
|
+ aura::client::ParentWindowWithContext( |
+ native_view, root_window, root_window->GetBoundsInScreen()); |
+ } |
} |
// And now, notify them that they have a brand new parent. |