| Index: ash/shelf/shelf_tooltip_manager.cc
|
| diff --git a/ash/shelf/shelf_tooltip_manager.cc b/ash/shelf/shelf_tooltip_manager.cc
|
| index 0f3a8758ab58b8cbc4eff5a45e8161ff8d94efe4..7ed0cc3e95e47d3c6fecd2ec7a5a816aac5c6447 100644
|
| --- a/ash/shelf/shelf_tooltip_manager.cc
|
| +++ b/ash/shelf/shelf_tooltip_manager.cc
|
| @@ -8,8 +8,8 @@
|
| #include "ash/root_window_controller.h"
|
| #include "ash/shelf/shelf_view.h"
|
| #include "ash/shelf/wm_shelf.h"
|
| +#include "ash/shell_port.h"
|
| #include "ash/system/tray/tray_constants.h"
|
| -#include "ash/wm_shell.h"
|
| #include "ash/wm_window.h"
|
| #include "base/bind.h"
|
| #include "base/strings/string16.h"
|
| @@ -125,12 +125,12 @@ ShelfTooltipManager::ShelfTooltipManager(ShelfView* shelf_view)
|
| bubble_(nullptr),
|
| weak_factory_(this) {
|
| shelf_view_->wm_shelf()->AddObserver(this);
|
| - WmShell::Get()->AddPointerWatcher(this,
|
| - views::PointerWatcherEventTypes::BASIC);
|
| + ShellPort::Get()->AddPointerWatcher(this,
|
| + views::PointerWatcherEventTypes::BASIC);
|
| }
|
|
|
| ShelfTooltipManager::~ShelfTooltipManager() {
|
| - WmShell::Get()->RemovePointerWatcher(this);
|
| + ShellPort::Get()->RemovePointerWatcher(this);
|
| shelf_view_->wm_shelf()->RemoveObserver(this);
|
| WmWindow* window = nullptr;
|
| if (shelf_view_->GetWidget())
|
|
|