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

Unified Diff: ui/aura/window.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
Index: ui/aura/window.cc
diff --git a/ui/aura/window.cc b/ui/aura/window.cc
index 217e38e10a6d70c6545c690ed5f74e0d0940fad0..6303b76f161111b3ccffbb9b273a827ac9483612 100644
--- a/ui/aura/window.cc
+++ b/ui/aura/window.cc
@@ -40,7 +40,8 @@ Window* GetParentForWindow(Window* window, Window* suggested_parent) {
if (suggested_parent)
return suggested_parent;
if (client::GetStackingClient())
- return client::GetStackingClient()->GetDefaultParent(window, gfx::Rect());
+ return client::GetStackingClient()->GetDefaultParent(
+ window, window, gfx::Rect());
return NULL;
}
« no previous file with comments | « ui/aura/test/test_stacking_client.cc ('k') | ui/views/examples/content_client/examples_browser_main_parts.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698