| Index: ash/wm/stacking_controller.h
|
| diff --git a/ash/wm/stacking_controller.h b/ash/wm/stacking_controller.h
|
| index 0aa690eee4046d5bf5112e343b888669cf61a366..bbe715eba30c3498dbd1dd7d7d77e6fbcf4bcccf 100644
|
| --- a/ash/wm/stacking_controller.h
|
| +++ b/ash/wm/stacking_controller.h
|
| @@ -11,12 +11,7 @@
|
| #include "base/memory/scoped_ptr.h"
|
| #include "ui/aura/client/window_tree_client.h"
|
|
|
| -namespace aura{
|
| -class RootWindow;
|
| -}
|
| -
|
| namespace ash {
|
| -
|
| namespace internal {
|
| class AlwaysOnTopController;
|
| }
|
| @@ -37,7 +32,7 @@ class ASH_EXPORT StackingController : public aura::client::WindowTreeClient {
|
| // normal modal container.
|
| // Otherwise those that originate from LockScreen container and above are
|
| // placed in the screen lock modal container.
|
| - aura::Window* GetSystemModalContainer(aura::RootWindow* root,
|
| + aura::Window* GetSystemModalContainer(aura::Window* root,
|
| aura::Window* window) const;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(StackingController);
|
|
|