Animating docked background in sync with shelf

ash/wm/workspace_controller.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_controller.h"
 
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/base_layout_manager.h"
@@ skipping 12 matching lines @@
 #include "ui/views/corewm/window_animations.h"
 
 namespace ash {
 namespace internal {
 namespace {
 
 // Amount of time to pause before animating anything. Only used during initial
 // animation (when logging in).
 const int kInitialPauseTimeMS = 750;
 
+// Returns true if the |window| is docked and visible.
+bool IsDockedAndVisible(const aura::Window* window) {
+  return (window->parent()->id() == kShellWindowId_DockedContainer &&
+          window->IsVisible() &&
+          !wm::GetWindowState(window)->IsMinimized() &&
+          window->type() != aura::client::WINDOW_TYPE_POPUP &&
+          !window->transient_parent());
+}
+
 }  // namespace
 
 WorkspaceController::WorkspaceController(aura::Window* viewport)
     : viewport_(viewport),
       shelf_(NULL),
       event_handler_(new WorkspaceEventHandler(viewport_)) {
   SetWindowVisibilityAnimationTransition(
       viewport_, views::corewm::ANIMATE_NONE);
 
   // The layout-manager cannot be created in the initializer list since it
@@ skipping 36 matching lines @@
       ui::Layer* layer = (*i)->layer();
       if (!layer->GetTargetVisibility() || layer->GetTargetOpacity() == 0.0f)
         continue;
       if (window_state->IsMaximized()) {
         // An untracked window may still be fullscreen so we keep iterating when
         // we hit a maximized window.
         has_maximized_window = true;
       } else if (window_state->IsFullscreen()) {
         return WORKSPACE_WINDOW_STATE_FULL_SCREEN;
       }
-      if (!window_overlaps_launcher && (*i)->bounds().Intersects(shelf_bounds))
+      if (!window_overlaps_launcher &&
+          ((*i)->bounds().Intersects(shelf_bounds) ||
+           IsDockedAndVisible(*i))) {
         window_overlaps_launcher = true;
+      }
     }
   }
   if (has_maximized_window)
     return WORKSPACE_WINDOW_STATE_MAXIMIZED;
 
   return window_overlaps_launcher ?
       WORKSPACE_WINDOW_STATE_WINDOW_OVERLAPS_SHELF :
       WORKSPACE_WINDOW_STATE_DEFAULT;
 }
 
@@ skipping 28 matching lines @@
     settings.SetTweenType(gfx::Tween::EASE_OUT);
     settings.SetTransitionDuration(
         base::TimeDelta::FromMilliseconds(kCrossFadeDurationMS));
     viewport_->layer()->SetTransform(gfx::Transform());
     viewport_->layer()->SetOpacity(1.0f);
   }
 }
 
 }  // namespace internal
 }  // namespace ash