Index: content/shell/shell_stacking_client_ash.cc |
diff --git a/content/shell/shell_stacking_client_ash.cc b/content/shell/shell_stacking_client_ash.cc |
index cdc93a72117bc73a13c52ca5757eea6901314cfd..75a708b95bbf41dbcc3b789dd4ca2c899e39293a 100644 |
--- a/content/shell/shell_stacking_client_ash.cc |
+++ b/content/shell/shell_stacking_client_ash.cc |
@@ -14,7 +14,6 @@ |
namespace content { |
ShellStackingClientAsh::ShellStackingClientAsh() { |
- aura::client::SetStackingClient(this); |
} |
ShellStackingClientAsh::~ShellStackingClientAsh() { |
@@ -25,6 +24,7 @@ ShellStackingClientAsh::~ShellStackingClientAsh() { |
} |
aura::Window* ShellStackingClientAsh::GetDefaultParent( |
+ aura::Window* context, |
aura::Window* window, |
const gfx::Rect& bounds) { |
if (!root_window_.get()) { |