OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ash/tooltips/tooltip_controller.h" | 5 #include "ash/tooltips/tooltip_controller.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "ash/ash_switches.h" | 9 #include "ash/ash_switches.h" |
10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
302 if (GetTooltip()->IsVisible()) | 302 if (GetTooltip()->IsVisible()) |
303 GetTooltip()->Hide(); | 303 GetTooltip()->Hide(); |
304 if (tooltip_window_) | 304 if (tooltip_window_) |
305 tooltip_window_->RemoveObserver(this); | 305 tooltip_window_->RemoveObserver(this); |
306 tooltip_window_ = NULL; | 306 tooltip_window_ = NULL; |
307 return ui::TOUCH_STATUS_UNKNOWN; | 307 return ui::TOUCH_STATUS_UNKNOWN; |
308 } | 308 } |
309 | 309 |
310 ui::GestureStatus TooltipController::PreHandleGestureEvent( | 310 ui::GestureStatus TooltipController::PreHandleGestureEvent( |
311 aura::Window* target, | 311 aura::Window* target, |
312 ui::GestureEventImpl* event) { | 312 ui::GestureEvent* event) { |
313 return ui::GESTURE_STATUS_UNKNOWN; | 313 return ui::GESTURE_STATUS_UNKNOWN; |
314 } | 314 } |
315 | 315 |
316 void TooltipController::OnWindowDestroyed(aura::Window* window) { | 316 void TooltipController::OnWindowDestroyed(aura::Window* window) { |
317 if (tooltip_window_ == window) { | 317 if (tooltip_window_ == window) { |
318 tooltip_window_->RemoveObserver(this); | 318 tooltip_window_->RemoveObserver(this); |
319 tooltip_window_ = NULL; | 319 tooltip_window_ = NULL; |
320 } | 320 } |
321 } | 321 } |
322 | 322 |
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
472 } | 472 } |
473 | 473 |
474 TooltipController::Tooltip* TooltipController::GetTooltip() { | 474 TooltipController::Tooltip* TooltipController::GetTooltip() { |
475 if (!tooltip_.get()) | 475 if (!tooltip_.get()) |
476 tooltip_.reset(new Tooltip); | 476 tooltip_.reset(new Tooltip); |
477 return tooltip_.get(); | 477 return tooltip_.get(); |
478 } | 478 } |
479 | 479 |
480 } // namespace internal | 480 } // namespace internal |
481 } // namespace ash | 481 } // namespace ash |
OLD | NEW |