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

Unified Diff: views/widget/widget.cc

Issue 7273084: Change the meaning of "Widget::GetTopLevelWidget()" to mean the logical top level Window in the v... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « views/widget/native_widget_win.cc ('k') | views/widget/widget_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/widget/widget.cc
===================================================================
--- views/widget/widget.cc (revision 91561)
+++ views/widget/widget.cc (working copy)
@@ -153,8 +153,10 @@
DestroyRootView();
- if (ownership_ == InitParams::WIDGET_OWNS_NATIVE_WIDGET)
+ if (ownership_ == InitParams::WIDGET_OWNS_NATIVE_WIDGET) {
+ CloseNow();
delete native_widget_;
+ }
}
// static
@@ -330,9 +332,7 @@
}
const Widget* Widget::GetTopLevelWidget() const {
- internal::NativeWidgetPrivate* native_widget =
- internal::NativeWidgetPrivate::GetTopLevelNativeWidget(GetNativeView());
- return native_widget ? native_widget->GetWidget() : NULL;
+ return native_widget_->GetTopLevelWidget();
}
void Widget::SetContentsView(View* view) {
« no previous file with comments | « views/widget/native_widget_win.cc ('k') | views/widget/widget_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698