This is r4523, with a few changes to make things work under Vista.

- Explicitly set_delegate(NULL) before releasing a TabContents. (I think
  the order messages are getting handled is different from XP; this only
  seems neccessary under Vista.)
- r4523 and someone elses change added entries to theme_resources.rc at
  roughly the same time, causing happy fun crashes.
- Roll in sgk's SConscript fix.

Review URL: http://codereview.chromium.org/9373

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4799 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 31 deletions

diff --git a/chrome/browser/views/constrained_window_animation.cc b/chrome/browser/views/constrained_window_animation.cc
index cedd0ba..e69de29 100644
--- a/chrome/browser/views/constrained_window_animation.cc
+++ b/chrome/browser/views/constrained_window_animation.cc
@@ -1,31 +0,0 @@
-// Copyright (c) 2006-2008 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/views/constrained_window_animation.h"
-#include "chrome/browser/views/constrained_window_impl.h"
-
-// The duration of the animation.
-static const int kDuration = 360;
-
-// The frame-rate for the animation.
-static const int kFrameRate = 60;
-
-////////////////////////////////////////////////////////////////////////////////
-// ConstrainedWindowAnimation, public:
-
-ConstrainedWindowAnimation::ConstrainedWindowAnimation(
-    ConstrainedWindowImpl* window)
-    : Animation(kDuration, kFrameRate, NULL), window_(window) {
-}
-
-ConstrainedWindowAnimation::~ConstrainedWindowAnimation() {
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// ConstrainedWindowAnimation, Animation implementation:
-
-void ConstrainedWindowAnimation::AnimateToState(double state) {
-  window_->SetTitlebarVisibilityPercentage(state);
-}
-