| Index: content/shell/shell_stacking_client_ash.h
|
| diff --git a/content/shell/shell_stacking_client_ash.h b/content/shell/shell_stacking_client_ash.h
|
| index d5adbc948dda9d80a2a7fb7fece9a6d62207a805..73e420deece8753ade90aee6a177451520cf5e10 100644
|
| --- a/content/shell/shell_stacking_client_ash.h
|
| +++ b/content/shell/shell_stacking_client_ash.h
|
| @@ -42,7 +42,8 @@ class ShellStackingClientAsh : public aura::client::StackingClient {
|
| virtual ~ShellStackingClientAsh();
|
|
|
| // 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;
|
|
|
| private:
|
|
|