Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(557)

Side by Side Diff: views/widget/widget.cc

Issue 7727001: Adds yet more debugging in hopes of tracking 91396. The latest data (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add back include merge stripped out Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « views/widget/widget.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "views/widget/widget.h" 5 #include "views/widget/widget.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "ui/base/l10n/l10n_font_util.h" 10 #include "ui/base/l10n/l10n_font_util.h"
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 dragged_view_(NULL), 146 dragged_view_(NULL),
147 event_stack_(), 147 event_stack_(),
148 ownership_(InitParams::NATIVE_WIDGET_OWNS_WIDGET), 148 ownership_(InitParams::NATIVE_WIDGET_OWNS_WIDGET),
149 is_secondary_widget_(true), 149 is_secondary_widget_(true),
150 frame_type_(FRAME_TYPE_DEFAULT), 150 frame_type_(FRAME_TYPE_DEFAULT),
151 disable_inactive_rendering_(false), 151 disable_inactive_rendering_(false),
152 widget_closed_(false), 152 widget_closed_(false),
153 saved_maximized_state_(false), 153 saved_maximized_state_(false),
154 minimum_size_(100, 100), 154 minimum_size_(100, 100),
155 focus_on_creation_(true), 155 focus_on_creation_(true),
156 is_top_level_(false) { 156 is_top_level_(false),
157 destroy_state_(DESTROY_STATE_NONE) {
157 } 158 }
158 159
159 Widget::~Widget() { 160 Widget::~Widget() {
161 destroy_state_ = DESTROY_STATE_DELETED;
162
160 while (!event_stack_.empty()) { 163 while (!event_stack_.empty()) {
161 event_stack_.top()->reset(); 164 event_stack_.top()->reset();
162 event_stack_.pop(); 165 event_stack_.pop();
163 } 166 }
164 167
165 DestroyRootView(); 168 DestroyRootView();
166 if (ownership_ == InitParams::WIDGET_OWNS_NATIVE_WIDGET) 169 if (ownership_ == InitParams::WIDGET_OWNS_NATIVE_WIDGET)
167 delete native_widget_; 170 delete native_widget_;
168 } 171 }
169 172
(...skipping 679 matching lines...) Expand 10 before | Expand all | Expand 10 after
849 widget_delegate_->GetAccessibleWindowRole()); 852 widget_delegate_->GetAccessibleWindowRole());
850 native_widget_->SetAccessibleState( 853 native_widget_->SetAccessibleState(
851 widget_delegate_->GetAccessibleWindowState()); 854 widget_delegate_->GetAccessibleWindowState());
852 855
853 if (widget_delegate_->IsModal()) 856 if (widget_delegate_->IsModal())
854 native_widget_->BecomeModal(); 857 native_widget_->BecomeModal();
855 } 858 }
856 859
857 void Widget::OnNativeWidgetDestroying() { 860 void Widget::OnNativeWidgetDestroying() {
858 FOR_EACH_OBSERVER(Observer, observers_, OnWidgetClosing(this)); 861 FOR_EACH_OBSERVER(Observer, observers_, OnWidgetClosing(this));
862 if (destroy_state_ == DESTROY_STATE_NONE)
863 destroy_state_ = DESTROY_STATE_IN_DESTROYING;
859 if (non_client_view_) 864 if (non_client_view_)
860 non_client_view_->WindowClosing(); 865 non_client_view_->WindowClosing();
861 widget_delegate_->WindowClosing(); 866 widget_delegate_->WindowClosing();
862 } 867 }
863 868
864 void Widget::OnNativeWidgetDestroyed() { 869 void Widget::OnNativeWidgetDestroyed() {
870 if (destroy_state_ == DESTROY_STATE_IN_DESTROYING ||
871 destroy_state_ == DESTROY_STATE_NONE)
872 destroy_state_ = DESTROY_STATE_DESTROYED;
865 widget_delegate_->DeleteDelegate(); 873 widget_delegate_->DeleteDelegate();
866 widget_delegate_ = NULL; 874 widget_delegate_ = NULL;
867 } 875 }
868 876
869 gfx::Size Widget::GetMinimumSize() { 877 gfx::Size Widget::GetMinimumSize() {
870 return non_client_view_ ? non_client_view_->GetMinimumSize() : gfx::Size(); 878 return non_client_view_ ? non_client_view_->GetMinimumSize() : gfx::Size();
871 } 879 }
872 880
873 void Widget::OnNativeWidgetSizeChanged(const gfx::Size& new_size) { 881 void Widget::OnNativeWidgetSizeChanged(const gfx::Size& new_size) {
874 root_view_->SetSize(new_size); 882 root_view_->SetSize(new_size);
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
1122 1130
1123 //////////////////////////////////////////////////////////////////////////////// 1131 ////////////////////////////////////////////////////////////////////////////////
1124 // internal::NativeWidgetPrivate, NativeWidget implementation: 1132 // internal::NativeWidgetPrivate, NativeWidget implementation:
1125 1133
1126 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() { 1134 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() {
1127 return this; 1135 return this;
1128 } 1136 }
1129 1137
1130 } // namespace internal 1138 } // namespace internal
1131 } // namespace views 1139 } // namespace views
OLDNEW
« no previous file with comments | « views/widget/widget.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698