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

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

Issue 7745049: Reverts debugging code added for 91396. I've tracked down the bug and (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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) {
158 } 157 }
159 158
160 Widget::~Widget() { 159 Widget::~Widget() {
161 destroy_state_ = DESTROY_STATE_DELETED;
162
163 while (!event_stack_.empty()) { 160 while (!event_stack_.empty()) {
164 event_stack_.top()->reset(); 161 event_stack_.top()->reset();
165 event_stack_.pop(); 162 event_stack_.pop();
166 } 163 }
167 164
168 DestroyRootView(); 165 DestroyRootView();
169 if (ownership_ == InitParams::WIDGET_OWNS_NATIVE_WIDGET) 166 if (ownership_ == InitParams::WIDGET_OWNS_NATIVE_WIDGET)
170 delete native_widget_; 167 delete native_widget_;
171 } 168 }
172 169
(...skipping 685 matching lines...) Expand 10 before | Expand all | Expand 10 after
858 widget_delegate_->GetAccessibleWindowRole()); 855 widget_delegate_->GetAccessibleWindowRole());
859 native_widget_->SetAccessibleState( 856 native_widget_->SetAccessibleState(
860 widget_delegate_->GetAccessibleWindowState()); 857 widget_delegate_->GetAccessibleWindowState());
861 858
862 if (widget_delegate_->IsModal()) 859 if (widget_delegate_->IsModal())
863 native_widget_->BecomeModal(); 860 native_widget_->BecomeModal();
864 } 861 }
865 862
866 void Widget::OnNativeWidgetDestroying() { 863 void Widget::OnNativeWidgetDestroying() {
867 FOR_EACH_OBSERVER(Observer, observers_, OnWidgetClosing(this)); 864 FOR_EACH_OBSERVER(Observer, observers_, OnWidgetClosing(this));
868 if (destroy_state_ == DESTROY_STATE_NONE)
869 destroy_state_ = DESTROY_STATE_IN_DESTROYING;
870 if (non_client_view_) 865 if (non_client_view_)
871 non_client_view_->WindowClosing(); 866 non_client_view_->WindowClosing();
872 widget_delegate_->WindowClosing(); 867 widget_delegate_->WindowClosing();
873 } 868 }
874 869
875 void Widget::OnNativeWidgetDestroyed() { 870 void Widget::OnNativeWidgetDestroyed() {
876 if (destroy_state_ == DESTROY_STATE_IN_DESTROYING ||
877 destroy_state_ == DESTROY_STATE_NONE)
878 destroy_state_ = DESTROY_STATE_DESTROYED;
879 widget_delegate_->DeleteDelegate(); 871 widget_delegate_->DeleteDelegate();
880 widget_delegate_ = NULL; 872 widget_delegate_ = NULL;
881 } 873 }
882 874
883 gfx::Size Widget::GetMinimumSize() { 875 gfx::Size Widget::GetMinimumSize() {
884 return non_client_view_ ? non_client_view_->GetMinimumSize() : gfx::Size(); 876 return non_client_view_ ? non_client_view_->GetMinimumSize() : gfx::Size();
885 } 877 }
886 878
887 void Widget::OnNativeWidgetSizeChanged(const gfx::Size& new_size) { 879 void Widget::OnNativeWidgetSizeChanged(const gfx::Size& new_size) {
888 root_view_->SetSize(new_size); 880 root_view_->SetSize(new_size);
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
1134 1126
1135 //////////////////////////////////////////////////////////////////////////////// 1127 ////////////////////////////////////////////////////////////////////////////////
1136 // internal::NativeWidgetPrivate, NativeWidget implementation: 1128 // internal::NativeWidgetPrivate, NativeWidget implementation:
1137 1129
1138 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() { 1130 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() {
1139 return this; 1131 return this;
1140 } 1132 }
1141 1133
1142 } // namespace internal 1134 } // namespace internal
1143 } // namespace views 1135 } // 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