diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-21 02:48:58 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-21 02:48:58 +0000 |
| commit | c87815f77ca7babd0a02e83e242430656a370a42 (patch) | |
| tree | 3abb1e8ec28c756eeccadae9eb9c177ee78d4501 /views/widget/widget.h | |
| parent | ea42d58ee7ab17ca8d73a6c133aaae1815d3e85c (diff) | |
| download | chromium_src-c87815f77ca7babd0a02e83e242430656a370a42.zip chromium_src-c87815f77ca7babd0a02e83e242430656a370a42.tar.gz chromium_src-c87815f77ca7babd0a02e83e242430656a370a42.tar.bz2 | |
Fixes crash introduced by fix for 11229. The fix for 11229 made it so
we might pass a bounds and maximized request when creating a browser
window. If for whatever reason that size isn't valid (say doesn't fit
on the monitor), then CreateWindow calls WM_POSCHANGED. The current
code didn't handle this too well because not all the state has been
set up yet.
BUG=89843
TEST=none
R=pkasting@chromium.org
Review URL: http://codereview.chromium.org/7466017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93319 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/widget/widget.h')
| -rw-r--r-- | views/widget/widget.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/views/widget/widget.h b/views/widget/widget.h index e71f1bac..883d86c 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) |