| Index: ash/aura/wm_shell_aura.cc
|
| diff --git a/ash/aura/wm_shell_aura.cc b/ash/aura/wm_shell_aura.cc
|
| index b0444b74ec98cafa892b116b1ff9c71fcd20a0e5..2021b6f783696dd65dc890117d9a015d01443584 100644
|
| --- a/ash/aura/wm_shell_aura.cc
|
| +++ b/ash/aura/wm_shell_aura.cc
|
| @@ -16,6 +16,7 @@
|
| #include "ash/shell_delegate.h"
|
| #include "ash/wm/drag_window_resizer.h"
|
| #include "ash/wm/overview/window_selector_controller.h"
|
| +#include "ash/wm/screen_pinning_controller.h"
|
| #include "ash/wm/window_util.h"
|
| #include "base/memory/ptr_util.h"
|
| #include "ui/aura/client/focus_client.h"
|
| @@ -79,6 +80,15 @@ bool WmShellAura::IsForceMaximizeOnFirstRun() {
|
| return Shell::GetInstance()->delegate()->IsForceMaximizeOnFirstRun();
|
| }
|
|
|
| +bool WmShellAura::IsPinned() {
|
| + return Shell::GetInstance()->screen_pinning_controller()->IsPinned();
|
| +}
|
| +
|
| +void WmShellAura::SetPinnedWindow(WmWindow* window) {
|
| + return Shell::GetInstance()->screen_pinning_controller()->SetPinnedWindow(
|
| + window);
|
| +}
|
| +
|
| bool WmShellAura::CanShowWindowForUser(WmWindow* window) {
|
| return Shell::GetInstance()->delegate()->CanShowWindowForUser(window);
|
| }
|
| @@ -174,10 +184,6 @@ void WmShellAura::RemoveShellObserver(ShellObserver* observer) {
|
| wm_shell_common_->RemoveShellObserver(observer);
|
| }
|
|
|
| -void WmShellAura::NotifyPinnedStateChanged(WmWindow* pinned_window) {
|
| - wm_shell_common_->NotifyPinnedStateChanged(pinned_window);
|
| -}
|
| -
|
| void WmShellAura::OnWindowActivated(
|
| aura::client::ActivationChangeObserver::ActivationReason reason,
|
| aura::Window* gained_active,
|
|
|