Refactor: Shelf Widget

ash/wm/workspace/workspace_cycler_animator.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/workspace/workspace_cycler_animator.h"
 
 #include <algorithm>
 #include <cmath>
 
 #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"
 #include "base/values.h"
 #include "ui/aura/window.h"
 #include "ui/base/events/event_utils.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/transform_util.h"
 #include "ui/views/widget/widget.h"
@@ skipping 627 matching lines @@
     double change) const {
   double ratio = Config::GetDouble(
       Config::CYCLER_STEP_ANIMATION_DURATION_RATIO);
   return static_cast<int>(fabs(change) * ratio);
 }
 
 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();

[James Cook, 2013/03/05 20:30:38]

Are you sure this is right? The old code is looking for the launcher's widget's
native window, whereas your code is getting the workspace's desktop window.

[Harry McCleave, 2013/03/06 01:59:49]

Done.

 
   // TODO(pkotwicz): Figure out what to do when the launcher visible state is
   // SHELF_AUTO_HIDE.
   ShelfLayoutManager* shelf_layout_manager =
       ShelfLayoutManager::ForLauncher(launcher_window);
   if (!shelf_layout_manager->IsVisible())
     return;
 
   gfx::Rect shelf_bounds = shelf_layout_manager->GetIdealBounds();
 
@@ skipping 41 matching lines @@
     MessageLoopForUI::current()->PostTask(
         FROM_HERE,
         base::Bind(&WorkspaceCyclerAnimator::NotifyDelegate,
                    AsWeakPtr(),
                    completed_animation));
   }
 }
 
 }  // namespace internal
 }  // namespace ash