Make Mandoline shut down cleanly.

ui/platform_window/win/win_window.cc

 // Copyright 2014 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/platform_window/win/win_window.h"
 
 #include "base/profiler/scoped_tracker.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/gfx/win/msg_util.h"
@@ skipping 20 matching lines @@
                           wr.right - wr.left, wr.bottom - wr.top);
   window_bounds.set_x(std::max(0, window_bounds.x()));
   window_bounds.set_y(std::max(0, window_bounds.y()));
   return window_bounds;
 }
 
 }  // namespace
 
 WinWindow::WinWindow(PlatformWindowDelegate* delegate,
                      const gfx::Rect& bounds)
-    : delegate_(delegate) {
+    : delegate_(delegate), destroyed_(false) {
   CHECK(delegate_);
   if (use_popup_as_root_window_for_test)
     set_window_style(WS_POPUP);
   gfx::Rect window_bounds = GetWindowBoundsForClientBounds(
       WS_OVERLAPPEDWINDOW, window_ex_style(), bounds);
   gfx::WindowImpl::Init(NULL, window_bounds);
   SetWindowText(hwnd(), L"WinWindow");
 }
 
 WinWindow::~WinWindow() {
@@ skipping 118 matching lines @@
 LRESULT WinWindow::OnCreate(CREATESTRUCT* create_struct) {
   // TODO(vadimt): Remove ScopedTracker below once crbug.com/440919 is fixed.
   tracked_objects::ScopedTracker tracking_profile(
       FROM_HERE_WITH_EXPLICIT_FUNCTION("440919 WinWindow::OnCreate"));
 
   delegate_->OnAcceleratedWidgetAvailable(hwnd());
   return 0;
 }
 
 void WinWindow::OnDestroy() {
+  if (destroyed_)

[Ben Goodger (Google), 2015/05/13 20:21:07]

Instead we should make ~WinWindow not call Destroy(). This may result in some
other code not closing the window but we should find those and change them to
call Close() prior to destructing this object.

[jam, 2015/05/14 14:42:48]

Done.

+    return;
+
+  destroyed_ = true;
+
   // TODO(vadimt): Remove ScopedTracker below once crbug.com/440919 is fixed.
   tracked_objects::ScopedTracker tracking_profile(
       FROM_HERE_WITH_EXPLICIT_FUNCTION("440919 WinWindow::OnDestroy"));
 
   delegate_->OnClosed();
 }
 
 void WinWindow::OnPaint(HDC) {
   // TODO(vadimt): Remove ScopedTracker below once crbug.com/440919 is fixed.
   tracked_objects::ScopedTracker tracking_profile(
@@ skipping 24 matching lines @@
 
 namespace test {
 
 // static
 void SetUsePopupAsRootWindowForTest(bool use) {
   use_popup_as_root_window_for_test = use;
 }
 
 }  // namespace test
 }  // namespace ui