| Index: ash/wm/panels/attached_panel_window_targeter.cc
|
| diff --git a/ash/wm/panels/attached_panel_window_targeter.cc b/ash/wm/panels/attached_panel_window_targeter.cc
|
| index 6380b444c9803191cb85a7e7c53b2d59d3ce557a..55845ea0064d77159b250bc75f1b7c6f09bfb2d2 100644
|
| --- a/ash/wm/panels/attached_panel_window_targeter.cc
|
| +++ b/ash/wm/panels/attached_panel_window_targeter.cc
|
| @@ -6,8 +6,8 @@
|
|
|
| #include "ash/common/shelf/wm_shelf.h"
|
| #include "ash/common/wm/panels/panel_layout_manager.h"
|
| -#include "ash/common/wm_shell.h"
|
| #include "ash/common/wm_window.h"
|
| +#include "ash/shell.h"
|
| #include "ui/aura/window.h"
|
|
|
| namespace ash {
|
| @@ -23,11 +23,11 @@ AttachedPanelWindowTargeter::AttachedPanelWindowTargeter(
|
| panel_container_(container),
|
| panel_layout_manager_(panel_layout_manager),
|
| default_touch_extend_(default_touch_extend) {
|
| - WmShell::Get()->AddShellObserver(this);
|
| + Shell::GetInstance()->AddShellObserver(this);
|
| }
|
|
|
| AttachedPanelWindowTargeter::~AttachedPanelWindowTargeter() {
|
| - WmShell::Get()->RemoveShellObserver(this);
|
| + Shell::GetInstance()->RemoveShellObserver(this);
|
| }
|
|
|
| void AttachedPanelWindowTargeter::OnShelfCreatedForRootWindow(
|
|
|