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/launcher/launcher_tooltip_manager.h" | 5 #include "ash/launcher/launcher_tooltip_manager.h" |
6 | 6 |
7 #include "ash/launcher/launcher_view.h" | 7 #include "ash/launcher/launcher_view.h" |
8 #include "ash/shelf/shelf_layout_manager.h" | 8 #include "ash/shelf/shelf_layout_manager.h" |
9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
10 #include "ash/shell_window_ids.h" | 10 #include "ash/shell_window_ids.h" |
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
327 } | 327 } |
328 | 328 |
329 void LauncherTooltipManager::CloseSoon() { | 329 void LauncherTooltipManager::CloseSoon() { |
330 MessageLoopForUI::current()->PostTask( | 330 MessageLoopForUI::current()->PostTask( |
331 FROM_HERE, | 331 FROM_HERE, |
332 base::Bind(&LauncherTooltipManager::Close, base::Unretained(this))); | 332 base::Bind(&LauncherTooltipManager::Close, base::Unretained(this))); |
333 } | 333 } |
334 | 334 |
335 void LauncherTooltipManager::ShowInternal() { | 335 void LauncherTooltipManager::ShowInternal() { |
336 if (view_) | 336 if (view_) |
337 view_->Show(); | 337 view_->GetWidget()->Show(); |
338 | 338 |
339 timer_.reset(); | 339 timer_.reset(); |
340 } | 340 } |
341 | 341 |
342 void LauncherTooltipManager::CreateBubble(views::View* anchor, | 342 void LauncherTooltipManager::CreateBubble(views::View* anchor, |
343 const string16& text) { | 343 const string16& text) { |
344 DCHECK(!view_); | 344 DCHECK(!view_); |
345 | 345 |
346 anchor_ = anchor; | 346 anchor_ = anchor; |
347 text_ = text; | 347 text_ = text; |
(...skipping 10 matching lines...) Expand all Loading... |
358 | 358 |
359 gfx::NativeView native_view = widget_->GetNativeView(); | 359 gfx::NativeView native_view = widget_->GetNativeView(); |
360 views::corewm::SetWindowVisibilityAnimationType( | 360 views::corewm::SetWindowVisibilityAnimationType( |
361 native_view, views::corewm::WINDOW_VISIBILITY_ANIMATION_TYPE_VERTICAL); | 361 native_view, views::corewm::WINDOW_VISIBILITY_ANIMATION_TYPE_VERTICAL); |
362 views::corewm::SetWindowVisibilityAnimationTransition( | 362 views::corewm::SetWindowVisibilityAnimationTransition( |
363 native_view, views::corewm::ANIMATE_HIDE); | 363 native_view, views::corewm::ANIMATE_HIDE); |
364 } | 364 } |
365 | 365 |
366 } // namespace internal | 366 } // namespace internal |
367 } // namespace ash | 367 } // namespace ash |
OLD | NEW |