Reland 179231

ash/shell/window_type_launcher.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 "ash/shell/window_type_launcher.h"
 
 #include "ash/root_window_controller.h"
 #include "ash/screensaver/screensaver_view.h"
 #include "ash/shell.h"
 #include "ash/shell/example_factory.h"
@@ skipping 142 matching lines @@
   }
   virtual bool CanResize() const OVERRIDE {
     return true;
   }
   virtual string16 GetWindowTitle() const OVERRIDE {
     return ASCIIToUTF16("Non-Modal Transient");
   }
   virtual void DeleteDelegate() OVERRIDE {
     if (GetWidget() == non_modal_transient_)
       non_modal_transient_ = NULL;
+
+    delete this;
   }
 
  private:
   SkColor color_;
 
   static views::Widget* non_modal_transient_;
 
   DISALLOW_COPY_AND_ASSIGN(NonModalTransient);
 };
 
@@ skipping 214 matching lines @@
   if (menu_runner_->RunMenuAt(GetWidget(), NULL, gfx::Rect(point, gfx::Size()),
         MenuItemView::TOPLEFT,
         MenuRunner::HAS_MNEMONICS | views::MenuRunner::CONTEXT_MENU) ==
         MenuRunner::MENU_DELETED)
     return;
 }
 #endif  // !defined(OS_MACOSX)
 
 }  // namespace shell
 }  // namespace ash