Reverting constrained window change. Seems to break tests on TOT.

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

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

2 files changed, 1 insertions, 13 deletions

diff --git a/chrome/browser/views/constrained_window_impl.cc b/chrome/browser/views/constrained_window_impl.cc
index 5e766e5..85d9e58 100644
--- a/chrome/browser/views/constrained_window_impl.cc
+++ b/chrome/browser/views/constrained_window_impl.cc
@@ -850,8 +850,6 @@ void ConstrainedWindowImpl::ActivateConstrainedWindow() {
     return;
   }
 
-  StopSuppressedAnimation();
-
   // Other pop-ups are simply moved to the front of the z-order.
   SetWindowPos(HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW);
 
@@ -1018,11 +1016,6 @@ void ConstrainedWindowImpl::StartSuppressedAnimation() {
   animation_->Start();
 }
 
-void ConstrainedWindowImpl::StopSuppressedAnimation() {
-  animation_->Stop();
-  animation_.reset();
-}
-
 void ConstrainedWindowImpl::CloseContents(TabContents* source) {
   Close();
 }
@@ -1165,9 +1158,6 @@ bool ConstrainedWindowImpl::CanDetach() const {
 
 void ConstrainedWindowImpl::Detach() {
   DCHECK(CanDetach());
-
-  StopSuppressedAnimation();
-
   // Tell the container not to restore focus to whatever view was focused last,
   // since this will interfere with the new window activation in the case where
   // a constrained window is destroyed by being detached.
diff --git a/chrome/browser/views/constrained_window_impl.h b/chrome/browser/views/constrained_window_impl.h
index 4218918..46022ae 100644
--- a/chrome/browser/views/constrained_window_impl.h
+++ b/chrome/browser/views/constrained_window_impl.h
@@ -93,9 +93,6 @@ class ConstrainedWindowImpl : public ConstrainedWindow,
   // this suppressed constrained popup window.
   void StartSuppressedAnimation();
 
-  // Stops the ConstrainedWindowAnimation, making the entire titlebar visible.
-  void StopSuppressedAnimation();
-
  protected:
   // Windows message handlers:
   virtual void OnDestroy();
@@ -205,3 +202,4 @@ class ConstrainedWindowImpl : public ConstrainedWindow,
 };
 
 #endif  // #ifndef CHROME_BROWSER_CONSTRAINED_WINDOW_IMPL_H_
+