Remove docked windows entirely in M59.

ash/common/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/common/wm/workspace_controller.h"
 
 #include <utility>
 
 #include "ash/common/shelf/wm_shelf.h"
-#include "ash/common/wm/dock/docked_window_layout_manager.h"
 #include "ash/common/wm/fullscreen_window_finder.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm/wm_window_animations.h"
 #include "ash/common/wm/workspace/workspace_event_handler.h"
 #include "ash/common/wm/workspace/workspace_layout_manager.h"
 #include "ash/common/wm/workspace/workspace_layout_manager_backdrop_delegate.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
@@ skipping 31 matching lines @@
 }
 
 wm::WorkspaceWindowState WorkspaceController::GetWindowState() const {
   if (!viewport_ || !viewport_->GetRootWindowController()->HasShelf())
     return wm::WORKSPACE_WINDOW_STATE_DEFAULT;
 
   const WmWindow* fullscreen = wm::GetWindowForFullscreenMode(viewport_);
   if (fullscreen && !fullscreen->GetWindowState()->ignored_by_shelf())
     return wm::WORKSPACE_WINDOW_STATE_FULL_SCREEN;
 
-  // These are the container ids of containers which may contain windows that
-  // may overlap the launcher shelf and affect its transparency.
-  const int kWindowContainerIds[] = {
-      kShellWindowId_DefaultContainer, kShellWindowId_DockedContainer,
-  };
   const gfx::Rect shelf_bounds(WmShelf::ForWindow(viewport_)->GetIdealBounds());
   bool window_overlaps_launcher = false;
-  for (size_t i = 0; i < arraysize(kWindowContainerIds); i++) {
-    WmWindow* container = viewport_->GetRootWindow()->GetChildByShellWindowId(
-        kWindowContainerIds[i]);
-    for (WmWindow* window : container->GetChildren()) {
-      wm::WindowState* window_state = window->GetWindowState();
-      if (window_state->ignored_by_shelf() ||
-          (window->GetLayer() && !window->GetLayer()->GetTargetVisibility())) {
-        continue;
-      }
-      if (window_state->IsMaximized())
-        return wm::WORKSPACE_WINDOW_STATE_MAXIMIZED;
-      window_overlaps_launcher |= window->GetBounds().Intersects(shelf_bounds);
+  // The default container may contain windows that may overlap the launcher
+  // shelf and affect its transparency.
+  WmWindow* container = viewport_->GetRootWindow()->GetChildByShellWindowId(
+      kShellWindowId_DefaultContainer);
+  for (WmWindow* window : container->GetChildren()) {
+    wm::WindowState* window_state = window->GetWindowState();
+    if (window_state->ignored_by_shelf() ||
+        (window->GetLayer() && !window->GetLayer()->GetTargetVisibility())) {
+      continue;
     }
+    if (window_state->IsMaximized())
+      return wm::WORKSPACE_WINDOW_STATE_MAXIMIZED;
+    window_overlaps_launcher |= window->GetBounds().Intersects(shelf_bounds);
   }
 
-  // Check if there are visible docked windows in the same display.
-  DockedWindowLayoutManager* dock = DockedWindowLayoutManager::Get(viewport_);
-  const bool docked_area_visible = dock && !dock->docked_bounds().IsEmpty();
-  return (window_overlaps_launcher || docked_area_visible)
+  return window_overlaps_launcher
              ? wm::WORKSPACE_WINDOW_STATE_WINDOW_OVERLAPS_SHELF
              : wm::WORKSPACE_WINDOW_STATE_DEFAULT;
 }
 
 void WorkspaceController::DoInitialAnimation() {
   viewport_->Show();
 
   ui::Layer* layer = viewport_->GetLayer();
   layer->SetOpacity(0.0f);
   SetTransformForScaleAnimation(layer, LAYER_SCALE_ANIMATION_ABOVE);
@@ skipping 27 matching lines @@
 void WorkspaceController::OnWindowDestroying(aura::Window* window) {
   DCHECK_EQ(WmWindow::Get(window), viewport_);
   viewport_->aura_window()->RemoveObserver(this);
   viewport_ = nullptr;
   // Destroy |event_handler_| too as it depends upon |window|.
   event_handler_.reset();
   layout_manager_ = nullptr;
 }
 
 }  // namespace ash