Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(562)

Unified Diff: views/widget/widget.h

Issue 7466017: Fixes crash introduced by fix for 11229. The fix for 11229 made it so (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Incorporate review feedback Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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)
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698