| Index: ash/shell/shell_delegate_impl.cc
|
| diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc
|
| index 9651040bc648b1dceb6cc033ea0c0fb98e5fc35f..6d1d47b03426cfad3397df4e05807424d4aea258 100644
|
| --- a/ash/shell/shell_delegate_impl.cc
|
| +++ b/ash/shell/shell_delegate_impl.cc
|
| @@ -17,6 +17,7 @@
|
| #include "ash/media_delegate.h"
|
| #include "ash/new_window_delegate.h"
|
| #include "ash/pointer_watcher_delegate_aura.h"
|
| +#include "ash/shell.h"
|
| #include "ash/shell/context_menu.h"
|
| #include "ash/shell/example_factory.h"
|
| #include "ash/shell/shelf_delegate_impl.h"
|
| @@ -184,7 +185,7 @@ bool ShellDelegateImpl::IsRunningInForcedAppMode() const {
|
| return false;
|
| }
|
|
|
| -bool ShellDelegateImpl::CanShowWindowForUser(aura::Window* window) const {
|
| +bool ShellDelegateImpl::CanShowWindowForUser(WmWindow* window) const {
|
| return true;
|
| }
|
|
|
|
|