Delete desktop/shell instance correctly when chrome is shutting down

ui/views/widget/native_widget_aura.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/widget/native_widget_aura.h"
 
 #include "base/bind.h"
 #include "base/string_util.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/drag_drop_client.h"
@@ skipping 354 matching lines @@
 void NativeWidgetAura::SetShape(gfx::NativeRegion region) {
   // No need for this.
 }
 
 void NativeWidgetAura::Close() {
   // |window_| may already be deleted by parent window. This can happen
   // when this widget is child widget or has transient parent
   // and ownership is WIDGET_OWNS_NATIVE_WIDGET.
   DCHECK(window_ ||
          ownership_ == Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET);
-  if (window_)
+  if (window_) {
     Hide();
-
-  window_->SetIntProperty(aura::kModalKey, 0);
+    window_->SetIntProperty(aura::kModalKey, 0);
+  }
 
   if (!close_widget_factory_.HasWeakPtrs()) {
     MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(&NativeWidgetAura::CloseNow,
                    close_widget_factory_.GetWeakPtr()));
   }
 }
 
 void NativeWidgetAura::CloseNow() {
@@ skipping 375 matching lines @@
   NOTIMPLEMENTED();
 }
 
 // static
 bool NativeWidgetPrivate::IsMouseButtonDown() {
   return aura::Desktop::GetInstance()->IsMouseButtonDown();
 }
 
 }  // namespace internal
 }  // namespace views