Index: views/widget/widget.cc |
diff --git a/views/widget/widget.cc b/views/widget/widget.cc |
index 7a42923d6fc6aee1feef095bd245d0d6b8b208b4..83401991184d0e0fd116b8e12c79733b81c71bfc 100644 |
--- a/views/widget/widget.cc |
+++ b/views/widget/widget.cc |
@@ -153,13 +153,10 @@ Widget::Widget() |
saved_maximized_state_(false), |
minimum_size_(100, 100), |
focus_on_creation_(true), |
- is_top_level_(false), |
- destroy_state_(DESTROY_STATE_NONE) { |
+ is_top_level_(false) { |
} |
Widget::~Widget() { |
- destroy_state_ = DESTROY_STATE_DELETED; |
- |
while (!event_stack_.empty()) { |
event_stack_.top()->reset(); |
event_stack_.pop(); |
@@ -865,17 +862,12 @@ void Widget::OnNativeWidgetCreated() { |
void Widget::OnNativeWidgetDestroying() { |
FOR_EACH_OBSERVER(Observer, observers_, OnWidgetClosing(this)); |
- if (destroy_state_ == DESTROY_STATE_NONE) |
- destroy_state_ = DESTROY_STATE_IN_DESTROYING; |
if (non_client_view_) |
non_client_view_->WindowClosing(); |
widget_delegate_->WindowClosing(); |
} |
void Widget::OnNativeWidgetDestroyed() { |
- if (destroy_state_ == DESTROY_STATE_IN_DESTROYING || |
- destroy_state_ == DESTROY_STATE_NONE) |
- destroy_state_ = DESTROY_STATE_DESTROYED; |
widget_delegate_->DeleteDelegate(); |
widget_delegate_ = NULL; |
} |