Index: views/widget/widget.h |
diff --git a/views/widget/widget.h b/views/widget/widget.h |
index e71f1bacd09c4e217cf53d1ef53ffb7842e76371..883d86c00cb6c759e3968dd37ebb603768c08619 100644 |
--- a/views/widget/widget.h |
+++ b/views/widget/widget.h |
@@ -482,7 +482,8 @@ class Widget : public internal::NativeWidgetDelegate, |
const_cast<const Widget*>(this)->client_view()); |
} |
const ClientView* client_view() const { |
- return non_client_view()->client_view(); |
+ // non_client_view_ may be NULL, especially during creation. |
+ return non_client_view_ ? non_client_view_->client_view() : NULL; |
} |
#if defined(UNIT_TEST) |