| Index: extensions/shell/browser/shell_desktop_controller_aura.h
|
| diff --git a/extensions/shell/browser/shell_desktop_controller_aura.h b/extensions/shell/browser/shell_desktop_controller_aura.h
|
| index c55b4583d61623a8b2d756b1023f7742f8c0d316..b16d4a31b3561a79f6c998c124b5e4d50ea26750 100644
|
| --- a/extensions/shell/browser/shell_desktop_controller_aura.h
|
| +++ b/extensions/shell/browser/shell_desktop_controller_aura.h
|
| @@ -80,8 +80,7 @@ class ShellDesktopControllerAura
|
| void CloseAppWindows() override;
|
|
|
| // aura::client::WindowParentingClient overrides:
|
| - aura::Window* GetDefaultParent(aura::Window* context,
|
| - aura::Window* window,
|
| + aura::Window* GetDefaultParent(aura::Window* window,
|
| const gfx::Rect& bounds) override;
|
|
|
| #if defined(OS_CHROMEOS)
|
|
|