reland of https://codereview.chromium.org/11364053/ w/o removing the per-rootwindow stacking client

ui/views/widget/desktop_native_widget_aura.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/widget/desktop_native_widget_aura.h"
 
 #include "base/bind.h"
 #include "ui/aura/client/stacking_client.h"
 #include "ui/aura/focus_manager.h"
 #include "ui/aura/root_window.h"
@@ skipping 25 matching lines @@
  public:
   explicit DesktopNativeWidgetAuraStackingClient(aura::RootWindow* root_window)
       : root_window_(root_window) {
     aura::client::SetStackingClient(root_window_, this);
   }
   virtual ~DesktopNativeWidgetAuraStackingClient() {
     aura::client::SetStackingClient(root_window_, NULL);
   }
 
   // Overridden from client::StackingClient:
-  virtual aura::Window* GetDefaultParent(aura::Window* window,
+  virtual aura::Window* GetDefaultParent(aura::Window* context,
+                                         aura::Window* window,
                                          const gfx::Rect& bounds) OVERRIDE {
     return root_window_;
   }
 
  private:
   aura::RootWindow* root_window_;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAuraStackingClient);
 };
 
@@ skipping 521 matching lines @@
     GetWidget()->non_client_view()->SchedulePaint();
 }
 
 void DesktopNativeWidgetAura::OnLostActive() {
   native_widget_delegate_->OnNativeWidgetActivationChanged(false);
   if (IsVisible() && GetWidget()->non_client_view())
     GetWidget()->non_client_view()->SchedulePaint();
 }
 
 }  // namespace views