Fix and re-enable slide-in/slide-out of infobars....

chrome_frame/infobars/internal/infobar_window.cc

 // Copyright (c) 2011 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.
 //
 // Implementation of the manager for infobar windows.
 
 #include "chrome_frame/infobars/internal/infobar_window.h"
 
 #include <algorithm>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "chrome_frame/function_stub.h"
 
 namespace {
 
 // length of each step when opening or closing
 const UINT kInfobarSlidingTimerIntervalMs = 50U;
 // pixels per step, when opening or closing
 const int kInfobarSlideOpenStep = 2;
 const int kInfobarSlideCloseStep = 6;
 
 }  // namespace
 
-void OnSliderTimer(InfobarWindow::Host* host) {
+VOID CALLBACK OnSliderTimer(InfobarWindow::Host* host,
+                            HWND /*hwnd*/, UINT /*uMsg*/,
+                            UINT_PTR /*idEvent*/, DWORD /*dwTime*/) {
   if (host)
     host->UpdateLayout();
 }
 
 InfobarWindow::InfobarWindow(InfobarType type)
     : type_(type),
       host_(NULL),
       target_height_(0),
       initial_height_(0),
       current_height_(0),
@@ skipping 96 matching lines @@
   if (StartTimer())
     slide_start_ = base::Time::Now();
   else
     slide_start_ = base::Time();  // NULL time means don't slide, resize now
 
   // Trigger an immediate re-laying out. The timer will handle remaining steps.
   host_->UpdateLayout();
 }
 
 bool InfobarWindow::StartTimer() {
-  return false;  // TODO(erikwright): Diagnose and fix crashes on IE.
-#if 0
   if (timer_id_ != 0)
     return true;
 
   DCHECK(timer_stub_ != NULL);
   if (timer_stub_ == NULL)
     return false;
 
   timer_id_ = ::SetTimer(NULL,
                          timer_id_,
                          kInfobarSlidingTimerIntervalMs,
                          reinterpret_cast<TIMERPROC>(timer_stub_->code()));
 
   DPLOG_IF(ERROR, timer_id_ == 0) << "Failure in SetTimer.";
 
   return timer_id_ != 0;
-#endif
 }
 
 bool InfobarWindow::StopTimer() {
   if (timer_id_ == 0)
     return true;
 
   if (::KillTimer(NULL, timer_id_)) {
     timer_id_ = 0;
     return true;
   }
@@ skipping 25 matching lines @@
     : infobar_window_(infobar_window) {
 }
 
 HWND InfobarWindow::FrameImpl::GetFrameWindow() {
   return infobar_window_->host_->GetContainerWindow();
 }
 
 void InfobarWindow::FrameImpl::CloseInfobar() {
   infobar_window_->Hide();
 }