Revert of Improving the user transition to add special cases for maximized windows and make the transition "m…

chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.cc

Index: chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.cc
diff --git a/chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.cc b/chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.cc
deleted file mode 100644
index 398c9b0a7fc94829db8883e8d095213a8e3c195d..0000000000000000000000000000000000000000
--- a/chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.cc
+++ /dev/null
@@ -1,324 +0,0 @@
-// Copyright 2014 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 "chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.h"
-
-#include "ash/desktop_background/user_wallpaper_delegate.h"
-#include "ash/root_window_controller.h"
-#include "ash/shelf/shelf_layout_manager.h"
-#include "ash/shell.h"
-#include "ash/wm/mru_window_tracker.h"
-#include "ash/wm/window_positioner.h"
-#include "ash/wm/window_state.h"
-#include "chrome/browser/chromeos/login/wallpaper_manager.h"
-#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
-#include "chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos.h"
-#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h"
-#include "ui/wm/public/activation_client.h"
-
-namespace chrome {
-
-namespace {
-
-// The animation time in milliseconds for the fade in and / or out when
-// switching users.
-const int kUserFadeTimeMS = 110;
-
-// The minimal possible animation time for animations which should happen
-// "instantly".
-const int kMinimalAnimationTimeMS = 1;
-
-// logic while the user gets switched.
-class UserChangeActionDisabler {
- public:
-  UserChangeActionDisabler() {
-    ash::WindowPositioner::DisableAutoPositioning(true);
-    ash::Shell::GetInstance()->mru_window_tracker()->SetIgnoreActivations(true);
-  }
-
-  ~UserChangeActionDisabler() {
-    ash::WindowPositioner::DisableAutoPositioning(false);
-    ash::Shell::GetInstance()->mru_window_tracker()->SetIgnoreActivations(
-        false);
-  }
- private:
-
-  DISALLOW_COPY_AND_ASSIGN(UserChangeActionDisabler);
-};
-
-}  // namespace
-
-UserSwichAnimatorChromeOS::UserSwichAnimatorChromeOS(
-    MultiUserWindowManagerChromeOS* owner,
-    const std::string& new_user_id,
-    bool animation_disabled)
-    : owner_(owner),
-      new_user_id_(new_user_id),
-      animation_disabled_(animation_disabled),
-      animation_step_(ANIMATION_STEP_HIDE_OLD_USER),
-      screen_cover_(GetScreenCover()) {
-  AdvanceUserTransitionAnimation();
-
-  if (animation_disabled_) {
-    FinalizeAnimation();
-  } else {
-    user_changed_animation_timer_.reset(new base::Timer(
-        FROM_HERE,
-        base::TimeDelta::FromMilliseconds(kUserFadeTimeMS),
-        base::Bind(
-            &UserSwichAnimatorChromeOS::AdvanceUserTransitionAnimation,
-            base::Unretained(this)),
-        true));
-    user_changed_animation_timer_->Reset();
-  }
-}
-
-UserSwichAnimatorChromeOS::~UserSwichAnimatorChromeOS() {
-  FinalizeAnimation();
-}
-
-// static
-bool UserSwichAnimatorChromeOS::CoversScreen(aura::Window* window) {
-  // Full screen covers the screen naturally. Since a normal window can have the
-  // same size as the work area, we only compare the bounds against the work
-  // area.
-  if (ash::wm::GetWindowState(window)->IsFullscreen())
-    return true;
-  gfx::Rect bounds = window->GetBoundsInRootWindow();
-  gfx::Rect work_area = gfx::Screen::GetScreenFor(window)->
-      GetDisplayNearestWindow(window).work_area();
-  bounds.Intersect(work_area);
-  return work_area == bounds;
-}
-
-void UserSwichAnimatorChromeOS::AdvanceUserTransitionAnimation() {
-  DCHECK_NE(animation_step_, ANIMATION_STEP_ENDED);
-
-  TransitionWallpaper(animation_step_);
-  TransitionUserShelf(animation_step_);
-  TransitionWindows(animation_step_);
-
-  // Advance to the next step.
-  switch (animation_step_) {
-    case ANIMATION_STEP_HIDE_OLD_USER:
-      animation_step_ = ANIMATION_STEP_SHOW_NEW_USER;
-      break;
-    case ANIMATION_STEP_SHOW_NEW_USER:
-      animation_step_ = ANIMATION_STEP_FINALIZE;
-      break;
-    case ANIMATION_STEP_FINALIZE:
-      user_changed_animation_timer_.reset();
-      animation_step_ = ANIMATION_STEP_ENDED;
-      break;
-    case ANIMATION_STEP_ENDED:
-      NOTREACHED();
-      break;
-  }
-}
-
-void UserSwichAnimatorChromeOS::FinalizeAnimation() {
-  user_changed_animation_timer_.reset();
-  while (ANIMATION_STEP_ENDED != animation_step_)
-    AdvanceUserTransitionAnimation();
-}
-
-void UserSwichAnimatorChromeOS::TransitionWallpaper(
-    AnimationStep animation_step) {
-  // Handle the wallpaper switch.
-  ash::UserWallpaperDelegate* wallpaper_delegate =
-      ash::Shell::GetInstance()->user_wallpaper_delegate();
-  if (animation_step == ANIMATION_STEP_HIDE_OLD_USER) {
-    // Set the wallpaper cross dissolve animation duration to our complete
-    // animation cycle for a fade in and fade out.
-    wallpaper_delegate->SetAnimationDurationOverride(
-        NO_USER_COVERS_SCREEN == screen_cover_ ? (2 * kUserFadeTimeMS) :
-                                                 kMinimalAnimationTimeMS);
-    if (screen_cover_ != NEW_USER_COVERS_SCREEN) {
-      chromeos::WallpaperManager::Get()->SetUserWallpaperNow(new_user_id_);
-      wallpaper_user_id_ =
-          (NO_USER_COVERS_SCREEN == screen_cover_ ? "->" : "") +
-          new_user_id_;
-    }
-  } else if (animation_step == ANIMATION_STEP_FINALIZE) {
-    // Revert the wallpaper cross dissolve animation duration back to the
-    // default.
-    if (screen_cover_ == NEW_USER_COVERS_SCREEN)
-      chromeos::WallpaperManager::Get()->SetUserWallpaperNow(new_user_id_);
-
-    // Coming here the wallpaper user id is the final result. No matter how we
-    // got here.
-    wallpaper_user_id_ = new_user_id_;
-    wallpaper_delegate->SetAnimationDurationOverride(0);
-  }
-}
-
-void UserSwichAnimatorChromeOS::TransitionUserShelf(
-    AnimationStep animation_step) {
-  // The shelf animation duration override.
-  int duration_override = kUserFadeTimeMS;
-  // Handle the shelf order of items. This is done once the old user is hidden.
-  if (animation_step == ANIMATION_STEP_SHOW_NEW_USER) {
-    // Some unit tests have no ChromeLauncherController.
-    if (ChromeLauncherController::instance())
-      ChromeLauncherController::instance()->ActiveUserChanged(new_user_id_);
-    // We kicked off the shelf animation in the command above. As such we can
-    // disable the override now again.
-    duration_override = 0;
-  }
-
-  if (animation_disabled_ || animation_step == ANIMATION_STEP_FINALIZE)
-    return;
-
-  ash::Shell::RootWindowControllerList controller =
-      ash::Shell::GetInstance()->GetAllRootWindowControllers();
-  for (ash::Shell::RootWindowControllerList::iterator iter = controller.begin();
-       iter != controller.end(); ++iter) {
-    (*iter)->GetShelfLayoutManager()->SetAnimationDurationOverride(
-        duration_override);
-  }
-
-  // For each root window hide the shelf.
-  if (animation_step == ANIMATION_STEP_HIDE_OLD_USER) {
-    aura::Window::Windows root_windows = ash::Shell::GetAllRootWindows();
-    for (aura::Window::Windows::const_iterator iter = root_windows.begin();
-         iter != root_windows.end(); ++iter) {
-      // This shelf change is only part of the animation and will be updated by
-      // ChromeLauncherController::ActiveUserChanged() to the new users value.
-      // Note that the user perference will not be changed.
-      ash::Shell::GetInstance()->SetShelfAutoHideBehavior(
-          ash::SHELF_AUTO_HIDE_ALWAYS_HIDDEN, *iter);
-    }
-  }
-}
-
-void UserSwichAnimatorChromeOS::TransitionWindows(
-    AnimationStep animation_step) {
-  // Disable the window position manager and the MRU window tracker temporarily.
-  UserChangeActionDisabler disabler;
-
-  if (animation_step == ANIMATION_STEP_HIDE_OLD_USER ||
-      (animation_step == ANIMATION_STEP_FINALIZE &&
-       screen_cover_ == BOTH_USERS_COVER_SCREEN)) {
-    // We need to show/hide the windows in the same order as they were created
-    // in their parent window(s) to keep the layer / window hierarchy in sync.
-    // To achieve that we first collect all parent windows and then enumerate
-    // all windows in those parent windows and show or hide them accordingly.
-
-    // Create a list of all parent windows we have to check.
-    std::set<aura::Window*> parent_list;
-    for (MultiUserWindowManagerChromeOS::WindowToEntryMap::const_iterator it =
-             owner_->window_to_entry().begin();
-         it != owner_->window_to_entry().end(); ++it) {
-      aura::Window* parent = it->first->parent();
-      if (parent_list.find(parent) == parent_list.end())
-        parent_list.insert(parent);
-    }
-
-    for (std::set<aura::Window*>::iterator it_parents = parent_list.begin();
-         it_parents != parent_list.end(); ++it_parents) {
-      const aura::Window::Windows window_list = (*it_parents)->children();
-      // In case of |BOTH_USERS_COVER_SCREEN| the desktop might shine through
-      // if all windows fade (in or out). To avoid this we only fade the topmost
-      // covering window (in / out) and make / keep all other covering windows
-      // visible while animating. |foreground_window_found| will get set when
-      // the top fading window was found.
-      bool foreground_window_found = false;
-      // Covering windows which follow the fade direction will also fade - all
-      // others will get immediately shown / kept shown until the animation is
-      // finished.
-      bool foreground_becomes_visible = false;
-      for (aura::Window::Windows::const_reverse_iterator it_window =
-               window_list.rbegin();
-           it_window != window_list.rend(); ++it_window) {
-        aura::Window* window = *it_window;
-        MultiUserWindowManagerChromeOS::WindowToEntryMap::const_iterator
-            it_map = owner_->window_to_entry().find(window);
-        if (it_map != owner_->window_to_entry().end()) {
-          bool should_be_visible =
-              it_map->second->show_for_user() == new_user_id_ &&
-              it_map->second->show();
-          bool is_visible = window->IsVisible();
-          ash::wm::WindowState* window_state = ash::wm::GetWindowState(window);
-          if (it_map->second->owner() == new_user_id_ &&
-              it_map->second->show_for_user() != new_user_id_ &&
-              window_state->IsMinimized()) {
-            // Pull back minimized visiting windows to the owners desktop.
-            owner_->ShowWindowForUserIntern(window, new_user_id_);
-            window_state->Unminimize();
-          } else if (should_be_visible != is_visible) {
-            bool animate = true;
-            int duration = animation_step == ANIMATION_STEP_FINALIZE ?
-                kMinimalAnimationTimeMS : (2 * kUserFadeTimeMS);
-            if (animation_step != ANIMATION_STEP_FINALIZE &&
-                screen_cover_ == BOTH_USERS_COVER_SCREEN &&
-                CoversScreen(window)) {
-              if (!foreground_window_found) {
-                foreground_window_found = true;
-                foreground_becomes_visible = should_be_visible;
-              } else if (should_be_visible != foreground_becomes_visible) {
-                // Covering windows behind the foreground window which are
-                // inverting their visibility should immediately become visible
-                // or stay visible until the animation is finished.
-                duration = kMinimalAnimationTimeMS;
-                if (!should_be_visible)
-                  animate = false;
-              }
-            }
-            if (animate)
-              owner_->SetWindowVisibility(window, should_be_visible, duration);
-          }
-        }
-      }
-    }
-  }
-
-  // Activation and real switch are happening after the other user gets shown.
-  if (animation_step == ANIMATION_STEP_SHOW_NEW_USER) {
-    // Finally we need to restore the previously active window.
-    ash::MruWindowTracker::WindowList mru_list =
-        ash::Shell::GetInstance()->mru_window_tracker()->BuildMruWindowList();
-    if (!mru_list.empty()) {
-      aura::Window* window = mru_list[0];
-      ash::wm::WindowState* window_state = ash::wm::GetWindowState(window);
-      if (owner_->IsWindowOnDesktopOfUser(window, new_user_id_) &&
-          !window_state->IsMinimized()) {
-        aura::client::ActivationClient* client =
-            aura::client::GetActivationClient(window->GetRootWindow());
-        // Several unit tests come here without an activation client.
-        if (client)
-          client->ActivateWindow(window);
-      }
-    }
-
-    // This is called directly here to make sure notification_blocker will see
-    // the new window status.
-    owner_->notification_blocker()->ActiveUserChanged(new_user_id_);
-  }
-}
-
-UserSwichAnimatorChromeOS::TransitioningScreenCover
-UserSwichAnimatorChromeOS::GetScreenCover() {
-  TransitioningScreenCover cover = NO_USER_COVERS_SCREEN;
-  for (MultiUserWindowManagerChromeOS::WindowToEntryMap::const_iterator it_map =
-           owner_->window_to_entry().begin();
-       it_map != owner_->window_to_entry().end();
-       ++it_map) {
-    aura::Window* window = it_map->first;
-    if (window->IsVisible() && CoversScreen(window)) {
-      if (cover == NEW_USER_COVERS_SCREEN)
-        return BOTH_USERS_COVER_SCREEN;
-      else
-        cover = OLD_USER_COVERS_SCREEN;
-    } else if (owner_->IsWindowOnDesktopOfUser(window, new_user_id_) &&
-               CoversScreen(window)) {
-      if (cover == OLD_USER_COVERS_SCREEN)
-        return BOTH_USERS_COVER_SCREEN;
-      else
-        cover = NEW_USER_COVERS_SCREEN;
-    }
-  }
-  return cover;
-}
-
-}  // namespace chrome