diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-08 21:01:12 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-08 21:01:12 +0000 |
| commit | 1a0cc6db8c687e04e16adaa40c7414bbd630fe4e (patch) | |
| tree | eee8ccb48aa15648082edbbecaba9ca31cb804d8 /views/widget | |
| parent | e25f4d7436f1ecb7a75b555d25e10ae77555aef7 (diff) | |
| download | chromium_src-1a0cc6db8c687e04e16adaa40c7414bbd630fe4e.zip chromium_src-1a0cc6db8c687e04e16adaa40c7414bbd630fe4e.tar.gz chromium_src-1a0cc6db8c687e04e16adaa40c7414bbd630fe4e.tar.bz2 | |
Last views_unittests fix.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88397 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/widget')
| -rw-r--r-- | views/widget/widget.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/views/widget/widget.cc b/views/widget/widget.cc index eeff786..f81ee88 100644 --- a/views/widget/widget.cc +++ b/views/widget/widget.cc @@ -433,9 +433,11 @@ void Widget::ResetLastMouseMoveFlag() { } void Widget::UpdateWindowTitle() { - // If the non-client view is rendering its own title, it'll need to relayout - // now. - non_client_view_->Layout(); + if (non_client_view_) { + // If the non-client view is rendering its own title, it'll need to relayout + // now. + non_client_view_->Layout(); + } // Update the native frame's text. We do this regardless of whether or not // the native frame is being used, since this also updates the taskbar, etc. @@ -582,7 +584,7 @@ void Widget::OnNativeWidgetDestroyed() { } gfx::Size Widget::GetMinimumSize() { - return non_client_view_->GetMinimumSize(); + return non_client_view_ ? non_client_view_->GetMinimumSize() : gfx::Size(); } void Widget::OnNativeWidgetSizeChanged(const gfx::Size& new_size) { |