Update shelf when overlapping dragged windows exist

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 40 matching lines @@
   viewport_->SetLayoutManager(NULL);
   viewport_->SetEventFilter(NULL);
   viewport_->RemovePreTargetHandler(event_handler_.get());
   viewport_->RemovePostTargetHandler(event_handler_.get());
 }
 
 WorkspaceWindowState WorkspaceController::GetWindowState() const {
   if (!shelf_)
     return WORKSPACE_WINDOW_STATE_DEFAULT;
 
+  // These are the container ids of containers which may contain windows that
+  // may overlap the launcher shelf and affect its transparency.
+  const int kWindowContainerIds[] = {
+      internal::kShellWindowId_DefaultContainer,
+      internal::kShellWindowId_DockedContainer,
+  };
   const gfx::Rect shelf_bounds(shelf_->GetIdealBounds());
-  const aura::Window::Windows& windows(viewport_->children());
   bool window_overlaps_launcher = false;
   bool has_maximized_window = false;
-  for (aura::Window::Windows::const_iterator i = windows.begin();
-       i != windows.end(); ++i) {
-    wm::WindowState* window_state = wm::GetWindowState(*i);
-    if (window_state->ignored_by_shelf())
-      continue;
-    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;
+  for (size_t idx = 0; idx < arraysize(kWindowContainerIds); idx++) {
+    const aura::Window* container = Shell::GetContainer(
+        viewport_->GetRootWindow(), kWindowContainerIds[idx]);
+    const aura::Window::Windows& windows(container->children());
+    for (aura::Window::Windows::const_iterator i = windows.begin();
+         i != windows.end(); ++i) {
+      wm::WindowState* window_state = wm::GetWindowState(*i);
+      if (window_state->ignored_by_shelf())
+        continue;
+      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))
+        window_overlaps_launcher = true;
     }
-    if (!window_overlaps_launcher && (*i)->bounds().Intersects(shelf_bounds))
-      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;
 }
 
 void WorkspaceController::SetShelf(ShelfLayoutManager* shelf) {
@@ skipping 27 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