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

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

Issue 10154013: Fixes crash in closing menus. There are two issues here: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixor Created 8 years, 7 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
« ui/views/widget/widget.h ('K') | « ui/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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ui/views/widget/widget.h" 5 #include "ui/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/hit_test.h" 10 #include "ui/base/hit_test.h"
(...skipping 846 matching lines...) Expand 10 before | Expand all | Expand 10 after
857 } 857 }
858 858
859 View* Widget::GetChildViewParent() { 859 View* Widget::GetChildViewParent() {
860 return GetContentsView() ? GetContentsView() : GetRootView(); 860 return GetContentsView() ? GetContentsView() : GetRootView();
861 } 861 }
862 862
863 gfx::Rect Widget::GetWorkAreaBoundsInScreen() const { 863 gfx::Rect Widget::GetWorkAreaBoundsInScreen() const {
864 return native_widget_->GetWorkAreaBoundsInScreen(); 864 return native_widget_->GetWorkAreaBoundsInScreen();
865 } 865 }
866 866
867 void Widget::OnOwnedParentClosing() {
868 }
869
867 //////////////////////////////////////////////////////////////////////////////// 870 ////////////////////////////////////////////////////////////////////////////////
868 // Widget, NativeWidgetDelegate implementation: 871 // Widget, NativeWidgetDelegate implementation:
869 872
870 bool Widget::IsModal() const { 873 bool Widget::IsModal() const {
871 return widget_delegate_->GetModalType() != ui::MODAL_TYPE_NONE; 874 return widget_delegate_->GetModalType() != ui::MODAL_TYPE_NONE;
872 } 875 }
873 876
874 bool Widget::IsDialogBox() const { 877 bool Widget::IsDialogBox() const {
875 return !!widget_delegate_->AsDialogDelegate(); 878 return !!widget_delegate_->AsDialogDelegate();
876 } 879 }
(...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after
1260 1263
1261 //////////////////////////////////////////////////////////////////////////////// 1264 ////////////////////////////////////////////////////////////////////////////////
1262 // internal::NativeWidgetPrivate, NativeWidget implementation: 1265 // internal::NativeWidgetPrivate, NativeWidget implementation:
1263 1266
1264 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() { 1267 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() {
1265 return this; 1268 return this;
1266 } 1269 }
1267 1270
1268 } // namespace internal 1271 } // namespace internal
1269 } // namespace views 1272 } // namespace views
OLDNEW
« ui/views/widget/widget.h ('K') | « ui/views/widget/widget.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698