Fix even more crashes. To help identify remaining crashes now and in the future, I have made the ...

views/widget/widget.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 "views/widget/widget.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "ui/base/l10n/l10n_font_util.h"
@@ skipping 42 matching lines @@
   Widget* widget_;
   const Event* event_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedEvent);
 };
 
 // A default implementation of WidgetDelegate, used by Widget when no
 // WidgetDelegate is supplied.
 class DefaultWidgetDelegate : public WidgetDelegate {
  public:
-  DefaultWidgetDelegate() {}
+  explicit DefaultWidgetDelegate(Widget* widget) : widget_(widget) {}
   virtual ~DefaultWidgetDelegate() {}
 
   // Overridden from WidgetDelegate:
   virtual void DeleteDelegate() OVERRIDE {
     delete this;
   }
+  virtual Widget* GetWidget() {
+    return widget_;
+  }
+  virtual const Widget* GetWidget() const {
+    return widget_;
+  }
 
  private:
+  Widget* widget_;
+
   DISALLOW_COPY_AND_ASSIGN(DefaultWidgetDelegate);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // Widget, InitParams:
 
 Widget::InitParams::InitParams()
     : type(TYPE_WINDOW),
       delegate(NULL),
       child(false),
@@ skipping 157 matching lines @@
 
 // static
 gfx::Size Widget::GetLocalizedContentsSize(int col_resource_id,
                                            int row_resource_id) {
   return gfx::Size(GetLocalizedContentsWidth(col_resource_id),
                    GetLocalizedContentsHeight(row_resource_id));
 }
 
 void Widget::Init(const InitParams& params) {
   widget_delegate_ =
-      params.delegate ? params.delegate : new DefaultWidgetDelegate;
+      params.delegate ? params.delegate : new DefaultWidgetDelegate(this);
   ownership_ = params.ownership;
   native_widget_ = params.native_widget ?
       params.native_widget->AsNativeWidgetPrivate() :
       internal::NativeWidgetPrivate::CreateNativeWidget(this);
   GetRootView();
   default_theme_provider_.reset(new DefaultThemeProvider);
   if (params.type == InitParams::TYPE_MENU)
     is_mouse_button_pressed_ = native_widget_->IsMouseButtonDown();
   native_widget_->InitNativeWidget(params);
   if (params.type == InitParams::TYPE_WINDOW) {
@@ skipping 720 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // internal::NativeWidgetPrivate, NativeWidget implementation:
 
 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() {
   return this;
 }
 
 }  // namespace internal
 }  // namespace views