Reland 179231

ui/oak/oak_window.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/oak/oak_window.h"
 
 #include "base/utf_string_conversions.h"
 #include "grit/ui_resources.h"
 #include "ui/aura/root_window.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 50 matching lines @@
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   return *rb.GetImageNamed(IDR_OAK).ToImageSkia();
 }
 
 bool OakWindow::ShouldShowWindowIcon() const {
   return true;
 }
 
 void OakWindow::DeleteDelegate() {
   instance = NULL;
+  delete this;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // OakWindow, views::View overrides:
 
 void OakWindow::OnPaint(gfx::Canvas* canvas) {
   canvas->DrawColor(SK_ColorWHITE);
   canvas->FillRect(separator_rect_, kBorderColor);
 }
 
@@ skipping 71 matching lines @@
     // context? For now, this is OK, but if we ever use Oak outside of the ash
     // shell, we run into crbug.com/165759.
     internal::OakWindow::instance =
         views::Widget::CreateWindowWithContextAndBounds(
             new internal::OakWindow, context, gfx::Rect(10, 10, 500, 500));
   }
   internal::OakWindow::instance->Show();
 }
 
 }  // namespace oak