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

Unified Diff: ui/aura/desktop/desktop_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: remove file 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/desktop/desktop_stacking_client.cc
diff --git a/ui/aura/desktop/desktop_stacking_client.cc b/ui/aura/desktop/desktop_stacking_client.cc
index afc0713ba8d601dfe48b0d5c80fb7db372d65417..415df156f98e0d2c0fb9bd33b91872b102bd4038 100644
--- a/ui/aura/desktop/desktop_stacking_client.cc
+++ b/ui/aura/desktop/desktop_stacking_client.cc
@@ -12,14 +12,14 @@
namespace aura {
DesktopStackingClient::DesktopStackingClient() {
- aura::client::SetStackingClient(this);
}
DesktopStackingClient::~DesktopStackingClient() {
aura::client::SetStackingClient(NULL);
}
-Window* DesktopStackingClient::GetDefaultParent(Window* window,
+Window* DesktopStackingClient::GetDefaultParent(Window* context,
+ Window* window,
const gfx::Rect& bounds) {
if (!null_parent_.get()) {
null_parent_.reset(new aura::RootWindow(

Powered by Google App Engine
This is Rietveld 408576698