| 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(
|
|
|