Index: ash/wm/workspace/workspace_cycler_animator.cc |
diff --git a/ash/wm/workspace/workspace_cycler_animator.cc b/ash/wm/workspace/workspace_cycler_animator.cc |
index ce7ecf3a42208287520eb24edd5f4258b62a5e0d..98717e60f54d873d75d85e689ddd427bd7dbd822 100644 |
--- a/ash/wm/workspace/workspace_cycler_animator.cc |
+++ b/ash/wm/workspace/workspace_cycler_animator.cc |
@@ -10,9 +10,10 @@ |
#include "ash/launcher/launcher.h" |
#include "ash/root_window_controller.h" |
#include "ash/screen_ash.h" |
+#include "ash/shelf/shelf_layout_manager.h" |
+#include "ash/shelf/shelf_widget.h" |
#include "ash/shell_window_ids.h" |
#include "ash/wm/property_util.h" |
-#include "ash/wm/shelf_layout_manager.h" |
#include "ash/wm/workspace/colored_window_controller.h" |
#include "ash/wm/workspace/workspace.h" |
#include "ash/wm/workspace/workspace_cycler_configuration.h" |
@@ -654,9 +655,7 @@ void WorkspaceCyclerAnimator::CreateLauncherBackground() { |
if (screen_bounds_ == maximized_bounds_) |
return; |
- aura::Window* random_workspace_window = workspaces_[0]->window(); |
- ash::Launcher* launcher = ash::Launcher::ForWindow(random_workspace_window); |
- aura::Window* launcher_window = launcher->widget()->GetNativeWindow(); |
+ aura::Window* launcher_window = workspaces_[0]->window(); |
// TODO(pkotwicz): Figure out what to do when the launcher visible state is |
// SHELF_AUTO_HIDE. |