Removes worskpace 1 code. Will rename next.

chrome/browser/chromeos/login/base_login_display_host.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 "chrome/browser/chromeos/login/base_login_display_host.h"
 
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
-#include "ash/wm/workspace_controller.h"  // temporary until w2 is the default.
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/customization_document.h"
@@ skipping 30 matching lines @@
 #include "ui/compositor/layer_animation_sequence.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/transform.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 
 // Whether sign in transitions are enabled.
 const bool kEnableBackgroundAnimation = false;

[Nikita (slow), 2012/10/17 14:43:11]

You could remove these too.

 const bool kEnableBrowserWindowsOpacityAnimation = true;
 const bool kEnableBrowserWindowsTransformAnimation = true;
 
 // Sign in transition timings.
 static const int kBackgroundTransitionPauseMs = 100;

[Nikita (slow), 2012/10/17 14:43:11]

These constants are not needed.

 static const int kBackgroundTransitionDurationMs = 400;
 static const int kBrowserTransitionPauseMs = 750;
 static const int kBrowserTransitionDurationMs = 350;
 
 // Parameters for background transform transition.
 const float kBackgroundScale = 1.05f;
 const int kBackgroundTranslate = -50;
 
 // Parameters for browser transform transition.
 const float kBrowserScale = 1.05f;
 const int kBrowserTranslate = -50;

[Nikita (slow), 2012/10/17 14:43:11]

And these too.

 
 // The delay of triggering initialization of the device policy subsystem
 // after the login screen is initialized. This makes sure that device policy
 // network requests are made while the system is idle waiting for user input.
 const int64 kPolicyServiceInitializationDelayMilliseconds = 100;
 
 // Determines the hardware keyboard from the given locale code
 // and the OEM layout information, and saves it to "Locale State".
 // The information will be used in InputMethodUtil::GetHardwareInputMethodId().
 void DetermineAndSaveHardwareKeyboard(const std::string& locale,
@@ skipping 233 matching lines @@
 void BaseLoginDisplayHost::StartAnimation() {
   if (ash::Shell::GetContainer(
           ash::Shell::GetPrimaryRootWindow(),
           ash::internal::kShellWindowId_DesktopBackgroundContainer)->
           children().empty()) {
     // If there is no background window, don't perform any animation on the
     // default and background layer because there is nothing behind it.
     return;
   }
 
-  // If we've been explicitly told not to do login animations, we will skip most
-  // of them. In particular, we'll avoid animating the background or animating
-  // the browser's transform.
-  const CommandLine* command_line = CommandLine::ForCurrentProcess();
-  bool disable_animations = command_line->HasSwitch(

[Nikita (slow), 2012/10/17 14:43:11]

Is this switch to disable login animations honored in
DoInitialWorkspaceAnimation().

I've initially added that on slow h/w like Alex/Zgb/Mario.

[sky, 2012/10/17 14:56:02]

Doesn't look like that code path was wired up for w2. I added it back.

-      switches::kDisableLoginAnimations);
-
-  const bool do_background_animation =
-      !ash::internal::WorkspaceController::IsWorkspace2Enabled() &&
-      kEnableBackgroundAnimation && !disable_animations;
-
-  const bool do_browser_transform_animation =
-      kEnableBrowserWindowsTransformAnimation && !disable_animations;
-
-  const bool do_browser_opacity_animation =
-      kEnableBrowserWindowsOpacityAnimation;
-
-  // Background animation.
-  if (do_background_animation) {
-    ui::Layer* background_layer =
-        ash::Shell::GetContainer(
-            ash::Shell::GetPrimaryRootWindow(),
-            ash::internal::kShellWindowId_DesktopBackgroundContainer)->
-                layer();
-
-    gfx::Transform background_transform;
-    background_transform.SetScale(kBackgroundScale, kBackgroundScale);
-    background_transform.SetTranslateX(kBackgroundTranslate);
-    background_transform.SetTranslateY(kBackgroundTranslate);
-    background_layer->SetTransform(background_transform);
-
-    // Pause
-    ui::LayerAnimationElement::AnimatableProperties background_pause_properties;
-    background_pause_properties.insert(ui::LayerAnimationElement::TRANSFORM);
-    background_layer->GetAnimator()->StartAnimation(
-        new ui::LayerAnimationSequence(
-            ui::LayerAnimationElement::CreatePauseElement(
-                background_pause_properties,
-                base::TimeDelta::FromMilliseconds(
-                    kBackgroundTransitionPauseMs))));
-
-    ui::ScopedLayerAnimationSettings settings(background_layer->GetAnimator());
-    settings.SetPreemptionStrategy(ui::LayerAnimator::ENQUEUE_NEW_ANIMATION);
-    settings.SetTransitionDuration(
-        base::TimeDelta::FromMilliseconds(kBackgroundTransitionDurationMs));
-    settings.SetTweenType(ui::Tween::EASE_OUT);
-    background_layer->SetTransform(gfx::Transform());
-  }
-
   // Browser windows layer opacity and transform animation.
-  if (ash::internal::WorkspaceController::IsWorkspace2Enabled()) {
-    ash::Shell::GetInstance()->DoInitialWorkspaceAnimation();
-  } else if (do_browser_transform_animation || do_browser_opacity_animation) {
-    ui::Layer* default_container_layer =
-        ash::Shell::GetContainer(
-            ash::Shell::GetPrimaryRootWindow(),
-            ash::internal::kShellWindowId_DefaultContainer)->layer();
-
-    ui::LayerAnimationElement::AnimatableProperties browser_pause_properties;
-
-    // Set the initial opacity and transform.
-    if (do_browser_transform_animation) {
-      gfx::Transform browser_transform;
-      browser_transform.SetScale(kBrowserScale, kBrowserScale);
-      browser_transform.SetTranslateX(kBrowserTranslate);
-      browser_transform.SetTranslateY(kBrowserTranslate);
-      default_container_layer->SetTransform(browser_transform);
-      browser_pause_properties.insert(ui::LayerAnimationElement::TRANSFORM);
-    }
-
-    if (do_browser_opacity_animation) {
-      default_container_layer->SetOpacity(0);
-      browser_pause_properties.insert(ui::LayerAnimationElement::OPACITY);
-    }
-
-    // Pause.
-    default_container_layer->GetAnimator()->ScheduleAnimation(
-        new ui::LayerAnimationSequence(
-            ui::LayerAnimationElement::CreatePauseElement(
-                browser_pause_properties,
-                base::TimeDelta::FromMilliseconds(kBrowserTransitionPauseMs))));
-
-    ui::ScopedLayerAnimationSettings settings(
-        default_container_layer->GetAnimator());
-
-    settings.SetPreemptionStrategy(ui::LayerAnimator::ENQUEUE_NEW_ANIMATION);
-    settings.SetTransitionDuration(
-        base::TimeDelta::FromMilliseconds(kBrowserTransitionDurationMs));
-
-    if (do_browser_opacity_animation) {
-      // Should interpolate linearly.
-      default_container_layer->SetOpacity(1);
-    }
-
-    if (do_browser_transform_animation) {
-      settings.SetTweenType(ui::Tween::EASE_OUT);
-      default_container_layer->SetTransform(gfx::Transform());
-    }
-  }
+  ash::Shell::GetInstance()->DoInitialWorkspaceAnimation();
 }
 
 void BaseLoginDisplayHost::OnOwnershipStatusCheckDone(
     DeviceSettingsService::OwnershipStatus status,
     bool current_user_is_owner) {
   if (status != DeviceSettingsService::OWNERSHIP_NONE) {
     // The device is already owned. No need for auto-enrollment checks.
     VLOG(1) << "CheckForAutoEnrollment: device already owned";
     return;
   }
@@ skipping 157 matching lines @@
   VLOG(1) << "Initial time zone: " << timezone_name;
   // Apply locale customizations only once to preserve whatever locale
   // user has changed to during OOBE.
   if (!timezone_name.empty()) {
     chromeos::system::TimezoneSettings::GetInstance()->SetTimezoneFromID(
         UTF8ToUTF16(timezone_name));
   }
 }
 
 }  // namespace chromeos