Revert EnableClose() removal and related crash fixes. I don't understand the crashes here, and th...

ui/views/window/non_client_view.cc

 // Copyright (c) 2011 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/window/non_client_view.h"
 
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/hit_test.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
@@ skipping 69 matching lines @@
 int NonClientView::NonClientHitTest(const gfx::Point& point) {
   // The NonClientFrameView is responsible for also asking the ClientView.
   return frame_view_->NonClientHitTest(point);
 }
 
 void NonClientView::GetWindowMask(const gfx::Size& size,
                                   gfx::Path* window_mask) {
   frame_view_->GetWindowMask(size, window_mask);
 }
 
+void NonClientView::EnableClose(bool enable) {
+  frame_view_->EnableClose(enable);
+}
+
 void NonClientView::ResetWindowControls() {
   frame_view_->ResetWindowControls();
 }
 
 void NonClientView::UpdateWindowIcon() {
   frame_view_->UpdateWindowIcon();
 }
 
 void NonClientView::LayoutFrameView() {
   // First layout the NonClientFrameView, which determines the size of the
@@ skipping 163 matching lines @@
 std::string NonClientFrameView::GetClassName() const {
   return kViewClassName;
 }
 
 void NonClientFrameView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
   // Overridden to do nothing. The NonClientView manually calls Layout on the
   // FrameView when it is itself laid out, see comment in NonClientView::Layout.
 }
 
 }  // namespace views