Sets the background color of shelf is opaque black when maximized (2nd)

ash/wm/workspace/workspace_manager.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_manager.h"
 
 #include <algorithm>
 #include <functional>
 
 #include "ash/root_window_controller.h"
@@ skipping 207 matching lines @@
     //   own workspace.
     if (!GetTrackedByWorkspace(window) ||
         (GetPersistsAcrossAllWorkspaces(window) &&
          !wm::IsWindowFullscreen(window) && !WillRestoreToWorkspace(window))) {
       ReparentWindow(window, active_workspace_->window(), NULL);
     } else {
       SetActiveWorkspace(workspace, SWITCH_WINDOW_MADE_ACTIVE,
                          base::TimeDelta());
     }
   }
+
   if (workspace->is_fullscreen() && wm::IsWindowFullscreen(window)) {
     // Clicking on the fullscreen window in a fullscreen workspace. Force all
     // other windows to drop to the desktop.
     MoveChildrenToDesktop(workspace->window(), NULL);
   }
 }
 
 Window* WorkspaceManager::GetActiveWorkspaceWindow() {
   return active_workspace_->window();
 }
@@ skipping 293 matching lines @@
     base::TimeDelta duration,
     bool show) const {
   WorkspaceAnimationDetails details;
   details.direction = show ? WORKSPACE_ANIMATE_UP : WORKSPACE_ANIMATE_DOWN;
   details.duration = duration;
 
   switch (reason) {
     case SWITCH_WORKSPACE_CYCLER:
       // The workspace cycler has already animated the desktop background's
       // opacity. Do not do any further animation.
-    case SWITCH_BACKGROUND_ONLY_WITHIN_DESKTOP:
-      // The show/hide of background may happen within the desktop workspace
-      // for maximized windows. In that case no animation is needed.
       break;
     case SWITCH_FULLSCREEN_FROM_FULLSCREEN_WORKSPACE:
     case SWITCH_MAXIMIZED_OR_RESTORED:
       // FadeDesktop() fades the desktop background by animating the opacity of
       // a black window immediately above the desktop background. Set the
       // workspace as animated to delay hiding the desktop background by
       // |duration|.
       details.animate = true;
       break;
     case SWITCH_INITIAL:
@@ skipping 120 matching lines @@
 
 void WorkspaceManager::OnWillRemoveWindowFromWorkspace(Workspace* workspace,
                                                        Window* child) {
   if (child->TargetVisibility())
     RearrangeVisibleWindowOnHideOrRemove(child);
   child->ClearProperty(kWorkspaceKey);
 }
 
 void WorkspaceManager::OnWindowRemovedFromWorkspace(Workspace* workspace,
                                                     Window* child) {
-  // Reappear the background which was hidden when a window is maximized.
-  if (wm::IsWindowMaximized(child) && workspace == active_workspace_ &&
-      GetWindowState() != WORKSPACE_WINDOW_STATE_MAXIMIZED) {
-    RootWindowController* root_controller = GetRootWindowController(
-        workspace->window()->GetRootWindow());
-    aura::Window* background = root_controller->GetContainer(
-        kShellWindowId_DesktopBackgroundContainer);;
-    ShowOrHideDesktopBackground(
-        background,
-        SWITCH_BACKGROUND_ONLY_WITHIN_DESKTOP,
-        base::TimeDelta(),
-        true);
-  }
-
   if (workspace->ShouldMoveToPending())
     MoveWorkspaceToPendingOrDelete(workspace, NULL, SWITCH_WINDOW_REMOVED);
   UpdateShelfVisibility();
 }
 
 void WorkspaceManager::OnWorkspaceChildWindowVisibilityChanged(
     Workspace* workspace,
     Window* child) {
   if (workspace->ShouldMoveToPending()) {
     MoveWorkspaceToPendingOrDelete(workspace, NULL, SWITCH_VISIBILITY_CHANGED);
@@ skipping 17 matching lines @@
 }
 
 void WorkspaceManager::OnWorkspaceWindowShowStateChanged(
     Workspace* workspace,
     Window* child,
     ui::WindowShowState last_show_state,
     ui::Layer* old_layer) {
   // |child| better still be in |workspace| else things have gone wrong.
   DCHECK_EQ(workspace, child->GetProperty(kWorkspaceKey));
 
-  if (active_workspace_ == workspace) {
-    // Show/hide state of the background has to be set here since maximized
-    // window doesn't create its own workspace anymore.
-    RootWindowController* root_controller = GetRootWindowController(
-        contents_window_->GetRootWindow());
-    aura::Window* background = root_controller->GetContainer(
-        kShellWindowId_DesktopBackgroundContainer);
-    if (wm::IsWindowMaximized(child)) {
-      ShowOrHideDesktopBackground(
-          background,
-          last_show_state == ui::SHOW_STATE_MINIMIZED ?
-          SWITCH_MAXIMIZED_OR_RESTORED :
-          SWITCH_BACKGROUND_ONLY_WITHIN_DESKTOP,
-          base::TimeDelta(),
-          false);
-    } else if (last_show_state == ui::SHOW_STATE_MAXIMIZED &&
-               GetWindowState() != WORKSPACE_WINDOW_STATE_MAXIMIZED) {
-      ShowOrHideDesktopBackground(
-          background,
-          SWITCH_BACKGROUND_ONLY_WITHIN_DESKTOP,
-          base::TimeDelta(),
-          true);
-    }
-  }
-
   if (wm::IsWindowMinimized(child)) {
     if (workspace->ShouldMoveToPending())
       MoveWorkspaceToPendingOrDelete(workspace, NULL, SWITCH_MINIMIZED);
     DCHECK(!old_layer);
   } else {
     // Set of cases to deal with:
     // . More than one fullscreen window: move newly fullscreen window into
     //   own workspace.
     // . One fullscreen window and not in a fullscreen workspace: move window
     //   into own workspace.
@@ skipping 85 matching lines @@
     new_workspace->window()->Show();
   ReparentWindow(window, new_workspace->window(), NULL);
   if (is_active) {
     SetActiveWorkspace(new_workspace, SWITCH_TRACKED_BY_WORKSPACE_CHANGED,
                        base::TimeDelta());
   }
 }
 
 }  // namespace internal
 }  // namespace ash