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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/wm/window_animations.cc

Issue 2899253002: chromeos: Rename ash::WmShelf to Shelf (Closed)
Patch Set: rebase Created 3 years, 7 months 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/panels/panel_window_resizer_unittest.cc ('k') | ash/wm/window_cycle_controller_unittest.cc » ('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 323eb9dd4386a807bfe8f7a89040b135010c7ae9..388e78cc04c6b8c45e310adef64384af9a18ffd0 100644
--- a/ash/wm/window_animations.cc
+++ b/ash/wm/window_animations.cc
@@ -9,7 +9,7 @@
#include <utility>
#include <vector>
-#include "ash/shelf/wm_shelf.h"
+#include "ash/shelf/shelf.h"
#include "ash/wm/window_animation_types.h"
#include "ash/wm/window_util.h"
#include "ash/wm/workspace_controller.h"
@@ -433,7 +433,7 @@ CreateBrightnessGrayscaleAnimationSequence(float target_value,
gfx::Rect GetMinimizeAnimationTargetBoundsInScreen(aura::Window* window) {
WmWindow* wm_window = WmWindow::Get(window);
- WmShelf* shelf = WmShelf::ForWindow(window);
+ Shelf* shelf = Shelf::ForWindow(window);
gfx::Rect item_rect = shelf->GetScreenBoundsOfItemIconForWindow(wm_window);
// The launcher item is visible and has an icon.
« no previous file with comments | « ash/wm/panels/panel_window_resizer_unittest.cc ('k') | ash/wm/window_cycle_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698