diff options
Diffstat (limited to 'ash/tooltips/tooltip_controller.cc')
| -rw-r--r-- | ash/tooltips/tooltip_controller.cc | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/ash/tooltips/tooltip_controller.cc b/ash/tooltips/tooltip_controller.cc index 8c187b6..c8bde19 100644 --- a/ash/tooltips/tooltip_controller.cc +++ b/ash/tooltips/tooltip_controller.cc @@ -10,8 +10,6 @@ #include "ash/shell.h" #include "ash/wm/coordinate_conversion.h" #include "ash/wm/cursor_manager.h" -#include "ash/wm/session_state_controller.h" -#include "ash/wm/session_state_observer.h" #include "base/command_line.h" #include "base/location.h" #include "base/string_split.h" @@ -214,15 +212,11 @@ TooltipController::TooltipController( base::TimeDelta::FromMilliseconds(kTooltipTimeoutMs), this, &TooltipController::TooltipTimerFired); DCHECK(drag_drop_client_); - if (Shell::GetInstance()) - Shell::GetInstance()->session_state_controller()->AddObserver(this); } TooltipController::~TooltipController() { if (tooltip_window_) tooltip_window_->RemoveObserver(this); - if (Shell::GetInstance()) - Shell::GetInstance()->session_state_controller()->RemoveObserver(this); } void TooltipController::UpdateTooltip(aura::Window* target) { @@ -311,13 +305,9 @@ void TooltipController::OnTouchEvent(ui::TouchEvent* event) { tooltip_window_ = NULL; } -void TooltipController::OnSessionStateEvent( - SessionStateObserver::EventType event) { - if (event == SessionStateObserver::EVENT_PRELOCK_ANIMATION_STARTED || - event == SessionStateObserver::EVENT_LOCK_ANIMATION_STARTED) { - if (tooltip_.get() && tooltip_->IsVisible()) - tooltip_->Hide(); - } +void TooltipController::OnCancelMode(ui::CancelModeEvent* event) { + if (tooltip_.get() && tooltip_->IsVisible()) + tooltip_->Hide(); } void TooltipController::OnWindowDestroyed(aura::Window* window) { |