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

Unified Diff: ui/views/widget/widget.cc

Issue 11030017: Add context to gfx::Screen calls in support of simultaneous desktop+ash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tidy Created 8 years, 2 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
Index: ui/views/widget/widget.cc
diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc
index 14aade85eba307d3e8f52d941e1e2a2d8e153322..6e079b603d896f859768b81c88f96de7185d0d86 100644
--- a/ui/views/widget/widget.cc
+++ b/ui/views/widget/widget.cc
@@ -62,7 +62,7 @@ NativeWidget* CreateNativeWidget(NativeWidget* native_widget,
}
if (!native_widget) {
native_widget =
- internal::NativeWidgetPrivate::CreateNativeWidget(delegate);
+ internal::NativeWidgetPrivate::CreateNativeWidget(delegate, parent);
}
}
return native_widget;
@@ -466,7 +466,8 @@ void Widget::CenterWindow(const gfx::Size& size) {
void Widget::SetBoundsConstrained(const gfx::Rect& bounds) {
gfx::Rect work_area =
- gfx::Screen::GetDisplayNearestPoint(bounds.origin()).work_area();
+ gfx::Screen::GetDisplayNearestPoint(
+ gfx::Screen::BadTwoWorldsContext(), bounds.origin()).work_area();
if (work_area.IsEmpty()) {
SetBounds(bounds);
} else {
« ash/display/display_controller.cc ('K') | « ui/views/widget/tooltip_manager_aura.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698