From db84ed0319cadfcff26cf9892f7fef2a84156bfb Mon Sep 17 00:00:00 2001 From: "ben@chromium.org" Date: Fri, 2 Dec 2011 22:06:15 +0000 Subject: Revert 112770 - Prevent a crash in the first run search engine selector. It is possible to try and close the window now before the TemplateURLService is loaded. In this case we will not have a fallback search engine to select by default. So we will just reject attempts to close the window in this circumstance until it is loaded and a fallback choice has been set. It should be an edge case. http://crbug.com/106078 TEST=unit test Review URL: http://codereview.chromium.org/8771018 TBR=ben@chromium.org Review URL: http://codereview.chromium.org/8790001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112804 0039d316-1c4b-4281-b951-d872f2087c98 --- ui/views/widget/widget.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ui/views/widget/widget.cc') diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc index deeaa38..472e284 100644 --- a/ui/views/widget/widget.cc +++ b/ui/views/widget/widget.cc @@ -466,8 +466,8 @@ void Widget::Close() { return; } - bool can_close = widget_delegate_->CanClose(); - if (non_client_view_ && can_close) + bool can_close = true; + if (non_client_view_) can_close = non_client_view_->CanClose(); if (can_close) { SaveWindowPlacement(); -- cgit v1.1