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

Unified Diff: ui/aura/test/test_stacking_client.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/aura/test/test_stacking_client.h ('k') | ui/aura/window.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/test/test_stacking_client.cc
diff --git a/ui/aura/test/test_stacking_client.cc b/ui/aura/test/test_stacking_client.cc
index c45537ebe0b4aa710d0ef6f3dc10a82e36d8cc50..6dd5dcf15e17ec904ec587c8387d2a915b7a3eb8 100644
--- a/ui/aura/test/test_stacking_client.cc
+++ b/ui/aura/test/test_stacking_client.cc
@@ -18,7 +18,8 @@ TestStackingClient::~TestStackingClient() {
client::SetStackingClient(NULL);
}
-Window* TestStackingClient::GetDefaultParent(Window* window,
+Window* TestStackingClient::GetDefaultParent(Window* context,
+ Window* window,
const gfx::Rect& bounds) {
return root_window_;
}
« no previous file with comments | « ui/aura/test/test_stacking_client.h ('k') | ui/aura/window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698