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

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

Issue 11364053: make StackingClient dispatch to either ash or desktop (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase + disable prerender tests on win-aura Created 8 years, 1 month 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 | « ui/views/widget/desktop_native_widget_aura.cc ('k') | ui/views/widget/widget.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/native_widget_aura.cc
diff --git a/ui/views/widget/native_widget_aura.cc b/ui/views/widget/native_widget_aura.cc
index 807c185d6d73cff299e7602f91907e00b36cf032..bb2cf65dfc9d7cdd45661649cb10eeeb216ecb6a 100644
--- a/ui/views/widget/native_widget_aura.cc
+++ b/ui/views/widget/native_widget_aura.cc
@@ -122,8 +122,8 @@ void NativeWidgetAura::InitNativeWidget(const Widget::InitParams& params) {
// If the parent is not specified, find the default parent for
// the |window_| using the desired |window_bounds|.
if (!parent) {
- parent = aura::client::GetStackingClient(params.GetParent())->
- GetDefaultParent(window_, window_bounds);
+ parent = aura::client::GetStackingClient()->
+ GetDefaultParent(params.context, window_, window_bounds);
} else if (window_bounds == gfx::Rect()) {
// If a parent is specified but no bounds are given,
// use the origin of the parent's display so that the widget
« no previous file with comments | « ui/views/widget/desktop_native_widget_aura.cc ('k') | ui/views/widget/widget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698