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

ui/aura/desktop/desktop_stacking_client.h

 // 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.
 
 #ifndef UI_AURA_DESKTOP_DESKTOP_STACKING_CLIENT_H_
 #define UI_AURA_DESKTOP_DESKTOP_STACKING_CLIENT_H_
 
 #include "ui/aura/client/stacking_client.h"
 
 #include "base/basictypes.h"
@@ skipping 19 matching lines @@
 }
 
 // A stacking client for the desktop; always sets the default parent to the
 // RootWindow of the passed in Window.
 class VIEWS_EXPORT DesktopStackingClient : public client::StackingClient {
  public:
   DesktopStackingClient();
   virtual ~DesktopStackingClient();
 
   // Overridden from client::StackingClient:
-  virtual Window* GetDefaultParent(Window* window,
+  virtual Window* GetDefaultParent(Window* context,
+                                   Window* window,
                                    const gfx::Rect& bounds) OVERRIDE;
 
  private:
   void CreateNULLParent();
 
   // Windows with NULL parents are parented to this.
   scoped_ptr<RootWindow> null_parent_;
 
   // All the member variables below are necessary for the NULL parent root
   // window to function.
   scoped_ptr<FocusManager> focus_manager_;
   // Depends on focus_manager_.
   scoped_ptr<DesktopActivationClient> activation_client_;
 
   scoped_ptr<views::corewm::InputMethodEventFilter> input_method_filter_;
   views::corewm::CompoundEventFilter* window_event_filter_;
 
   scoped_ptr<client::DefaultCaptureClient> capture_client_;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopStackingClient);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_DESKTOP_DESKTOP_STACKING_CLIENT_H_