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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/wm/workspace/workspace_cycler_animator.cc

Issue 12313118: Refactor: Shelf Widget (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 years, 10 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
« ash/wm/panel_layout_manager.cc ('K') | « ash/wm/workspace/phantom_window_controller.cc ('k') | ash/wm/workspace/workspace_layout_manager_unittest.cc » ('j') | ui/compositor/layer_animation_element.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 a22375c4e84c3d6fae22c83b3c8256085dc44ad9..1f0a9a38ec86868f2f7995d3805bc7ee33baa2b2 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"
@@ -660,9 +661,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();
James Cook 2013/03/05 20:30:38 Are you sure this is right? The old code is lookin
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.
« ash/wm/panel_layout_manager.cc ('K') | « ash/wm/workspace/phantom_window_controller.cc ('k') | ash/wm/workspace/workspace_layout_manager_unittest.cc » ('j') | ui/compositor/layer_animation_element.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698