Revert of Don't allow a widget to send close notifications more than once.

ui/views/widget/widget.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/widget/widget.h"
 
 #include "base/auto_reset.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 563 matching lines @@
 }
 
 void Widget::Close() {
   if (widget_closed_) {
     // It appears we can hit this code path if you close a modal dialog then
     // close the last browser before the destructor is hit, which triggers
     // invoking Close again.
     return;
   }
 
-  if (non_client_view_ && !non_client_view_->CanClose())
-    return;
+  bool can_close = true;
+  if (non_client_view_)
+    can_close = non_client_view_->CanClose();
+  if (can_close) {
+    SaveWindowPlacement();
 
-  // The actions below can cause this function to be called again, so mark
-  // |this| as closed early. See crbug.com/714334
-  widget_closed_ = true;
-  SaveWindowPlacement();
+    // During tear-down the top-level focus manager becomes unavailable to
+    // GTK tabbed panes and their children, so normal deregistration via
+    // |FormManager::ViewRemoved()| calls are fouled.  We clear focus here
+    // to avoid these redundant steps and to avoid accessing deleted views
+    // that may have been in focus.
+    if (is_top_level() && focus_manager_.get())
+      focus_manager_->SetFocusedView(NULL);
 
-  // During tear-down the top-level focus manager becomes unavailable to
-  // GTK tabbed panes and their children, so normal deregistration via
-  // |FocusManager::ViewRemoved()| calls are fouled.  We clear focus here
-  // to avoid these redundant steps and to avoid accessing deleted views
-  // that may have been in focus.
-  if (is_top_level() && focus_manager_.get())
-    focus_manager_->SetFocusedView(nullptr);
+    for (WidgetObserver& observer : observers_)
+      observer.OnWidgetClosing(this);
 
-  for (WidgetObserver& observer : observers_)
-    observer.OnWidgetClosing(this);
-
-  native_widget_->Close();
+    native_widget_->Close();
+    widget_closed_ = true;
+  }
 }
 
 void Widget::CloseNow() {
   for (WidgetObserver& observer : observers_)
     observer.OnWidgetClosing(this);
   native_widget_->CloseNow();
 }
 
 bool Widget::IsClosed() const {
   return widget_closed_;
@@ skipping 953 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // internal::NativeWidgetPrivate, NativeWidget implementation:
 
 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() {
   return this;
 }
 
 }  // namespace internal
 }  // namespace views