Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(542)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/wm/window_animations.cc

Issue 71653003: ash: Rename LauncherModel to ShelfModel. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chrome changes Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/wm/system_gesture_event_filter_unittest.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/window_animations.cc
diff --git a/ash/wm/window_animations.cc b/ash/wm/window_animations.cc
index ffbe00789a66fbcbac40c1c0f6aacbaf2c307ad5..13abd4a8c2307b640cd2e3c58b1a17da6cd1046c 100644
--- a/ash/wm/window_animations.cc
+++ b/ash/wm/window_animations.cc
@@ -513,11 +513,10 @@ void SetTransformForScaleAnimation(ui::Layer* layer,
gfx::Rect GetMinimizeAnimationTargetBoundsInScreen(aura::Window* window) {
Launcher* launcher = Launcher::ForWindow(window);
- // Launcher is created lazily and can be NULL.
+ // Shelf is created lazily and can be NULL.
if (!launcher)
return gfx::Rect();
- gfx::Rect item_rect = launcher->
- GetScreenBoundsOfItemIconForWindow(window);
+ gfx::Rect item_rect = launcher->GetScreenBoundsOfItemIconForWindow(window);
// The launcher item is visible and has an icon.
if (!item_rect.IsEmpty())
« no previous file with comments | « ash/wm/system_gesture_event_filter_unittest.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698