Index: ui/views/widget/native_widget_aura.cc |
=================================================================== |
--- ui/views/widget/native_widget_aura.cc (revision 177189) |
+++ ui/views/widget/native_widget_aura.cc (working copy) |
@@ -136,8 +136,15 @@ |
if (parent) { |
parent->AddChild(window_); |
} else { |
- window_->SetDefaultParentByRootWindow(context->GetRootWindow(), |
- window_bounds); |
+ // TODO(erg): Once I've threaded context through chrome, uncomment this |
+ // check, which currently fails on the NULL == NULL case. |
+ // |
+ // DCHECK_NE(params.GetParent(), params.context); |
+ |
+ // TODO(erg): Remove this NULL check once we've made everything in views |
+ // actually pass us a context. |
+ aura::RootWindow* root_window = context ? context->GetRootWindow() : NULL; |
+ window_->SetDefaultParentByRootWindow(root_window, window_bounds); |
} |
// Wait to set the bounds until we have a parent. That way we can know our |